more

Author: gagolews

.github/workflows/r.yml

@@ -17,7 +17,12 @@ jobs:
         #sudo apt-get -y upgrade
         sudo apt-get -y install libcurl4-openssl-dev r-base-dev
         sudo Rscript -e "install.packages(c('Rcpp', 'tinytest'))"
-    - name: Test and check R
+    - name: Check R
+      run: |
+        sudo R CMD INSTALL .
+        sudo Rscript -e 'source(".devel/tinytest.R")'
+
+    - name: Check R
       run: |
         #sudo make r-check
         cd .. && sudo R CMD build quitefastmst && sudo R_DEFAULT_INTERNET_TIMEOUT=240 _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE _R_CHECK_FORCE_SUGGESTS_=0 R CMD check `ls -t quitefastmst*.tar.gz | head -1` --as-cran --no-manual

README.md

@@ -67,9 +67,7 @@ from sources:
 CPPFLAGS="-O3 -march=native" pip3 install quitefastmst --force --no-binary="quitefastmst"
 ```
 
-🚧 TO DO (help needed): How to enable OpenMP support on macOS/Darwin?
-
-🚧 TO DO (help needed): How to enable OpenMP support on Windows?
+🚧 TO DO (help needed): How to enable OpenMP support on macOS/Darwin in `setup.py`?
 
 
 

setup.py

@@ -1,5 +1,5 @@
 """
-quitefastmst Pyhon Package
+quitefastmst Python Package
 """
 
 # ############################################################################ #
@@ -77,11 +77,10 @@ def build_extensions(self):
                 e.extra_link_args += ['-openmp']
         elif sys.platform == "darwin":  # and 'openmp' in os.getenv('CPPFLAGS', ''):
             # https://github.com/scikit-learn/scikit-learn/blob/d640b7fc61ce716af9d113a7c92c953c1ec3e36f/sklearn/_build_utils/openmp_helpers.py
-            # -fopenmp can't be passed as compile flag when using Apple-clang.
+            # says: "-fopenmp can't be passed as compile flag when using Apple-clang.
             # OpenMP support has to be enabled during preprocessing.
-            #
             # For example, our macOS wheel build jobs use the following environment
-            # variables to build with Apple-clang and the brew installed "libomp":
+            # variables to build with Apple-clang and the brew installed "libomp":"
             #
             # export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp"
             # export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include"

src/knn_euclid_kdtree.cpp

@@ -181,29 +181,29 @@ template void Cknn2_euclid_kdtree<float>(
     const float* Y, const Py_ssize_t m,
     const Py_ssize_t d, const Py_ssize_t k,
     float* nn_dist, Py_ssize_t* nn_ind,
-    Py_ssize_t max_leaf_size=32, bool squared, bool verbose
+    Py_ssize_t max_leaf_size, bool squared, bool verbose
 );
 
 template void Cknn2_euclid_kdtree<double>(
     double* X, const Py_ssize_t n,
     const double* Y, const Py_ssize_t m,
     const Py_ssize_t d, const Py_ssize_t k,
     double* nn_dist, Py_ssize_t* nn_ind,
-    Py_ssize_t max_leaf_size=32, bool squared, bool verbose
+    Py_ssize_t max_leaf_size, bool squared, bool verbose
 );
 
 
 template void Cknn1_euclid_kdtree<float>(
     float* X, const Py_ssize_t n,
     const Py_ssize_t d, const Py_ssize_t k,
     float* nn_dist, Py_ssize_t* nn_ind,
-    Py_ssize_t max_leaf_size=32, bool squared, bool verbose
+    Py_ssize_t max_leaf_size, bool squared, bool verbose
 );
 
 
 template void Cknn1_euclid_kdtree<double>(
     double* X, const Py_ssize_t n,
     const Py_ssize_t d, const Py_ssize_t k,
     double* nn_dist, Py_ssize_t* nn_ind,
-    Py_ssize_t max_leaf_size=32, bool squared, bool verbose
+    Py_ssize_t max_leaf_size, bool squared, bool verbose
 );