Merge pull request #8 from saudzahirr/develop

Develop
saudzahirr · Mar 22, 2024 · 3b8ec1d · 3b8ec1d
2 parents 766ddd0 + 77afe2b
commit 3b8ec1d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ dist/
 build/
 lib/
 
+_version.py
 *.log
 
 

diff --git a/environment.yml b/environment.yml
@@ -4,5 +4,18 @@ channels:
 dependencies:
   - python=3.11
   - pip
+  - wheel
+  - setuptools
+  - scikit-build
+  - requests
+  - numpy
+  - scipy
+  - pandas
+  - matplotlib
+  - plotly
+  - psutil
+  - ruff
+  - pytest
+  - tqdm
   - pip:
-    - -r requirements.txt
+  - - -r requirements.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel"]
+requires = ["setuptools", "setuptools_scm", "wheel"]
+
+[tool.setuptools_scm]
+version_file = "src/_version.py"
diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1 @@
 importlib-metadata; python_version < "3.10"
-wheel
-setuptools
-scikit-build
-requests
-numpy
-scipy
-pandas
-matplotlib
-plotly
-psutil
-ruff
-pytest
-tqdm
diff --git a/src/eigenlib/logger.cpp b/src/eigenlib/logger.cpp
@@ -104,14 +104,6 @@ string getCMakeVersion() {
     return executeCommand("cmake --version");
 }
 
-int get_num_of_threads() {
-#ifdef _WIN32
-    return thread::hardware_concurrency();
-#else
-    return omp_get_thread_num();
-#endif
-}
-
 void logSystemInfoOnce() {
     static bool systemInfoLogged = false;
     if (!systemInfoLogged) {
@@ -127,7 +119,7 @@ void logSystemInfoOnce() {
 
         string systemInfo = "CMake Version: " + getCMakeVersion() + "\n" +
                             + "G++ Version: " + getGPPVersion() + "\n" +
-                            + "OMP max threads: " + to_string(get_num_of_threads());
+                            + "OMP max threads: " + to_string(omp_get_max_threads());
 
         ofstream logFile("vonMises.log", ios::out);
         if (logFile.is_open()) {