update

htool-ddm · Sep 8, 2023 · 9550c37 · 9550c37
1 parent 5653623
commit 9550c37
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -124,23 +124,24 @@ jobs:
       - name: Build package in release
         if: matrix.CODE_COVERAGE == 'OFF'
         run: |
-          pip3 install .[test] --user --verbose
+          pip3 install cmake numpy matplotlib
+          pip3 install .[test] --user --verbose --no-build-isolation
 
       - name: Build package in debug for coverage
         if: matrix.CODE_COVERAGE == 'ON'
         run: |
           mkdir build && cd build
-          pip3 install numpy matplotlib pytest mpi4py
+          pip3 install cmake numpy matplotlib
           CC=${{ matrix.CC_COMPILER }} CXX=${{ matrix.CXX_COMPILER }} cmake -DUSE_SANITIZER=${{ matrix.USE_SANITIZER }} -DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} -DCODE_COVERAGE=${{ matrix.CODE_COVERAGE }} ../
           make
 
       - name: Run tests
         run: |
           export PYTHONPATH="$PWD/build"
-          mpirun -np 1 ${{ matrix.MPIEXEC_PREFLAGS }} pytest tests
-          mpirun -np 2 ${{ matrix.MPIEXEC_PREFLAGS }} pytest tests
-          mpirun -np 3 ${{ matrix.MPIEXEC_PREFLAGS }} pytest tests
-          mpirun -np 4 ${{ matrix.MPIEXEC_PREFLAGS }} pytest tests
+          mpirun -np 1 ${{ matrix.MPIEXEC_PREFLAGS }} python3 -m pytest tests
+          mpirun -np 2 ${{ matrix.MPIEXEC_PREFLAGS }} python3 -m pytest tests
+          mpirun -np 3 ${{ matrix.MPIEXEC_PREFLAGS }} python3 -m pytest tests
+          mpirun -np 4 ${{ matrix.MPIEXEC_PREFLAGS }} python3 -m pytest tests
 
       - name: Check format
         if: matrix.CODE_COVERAGE == 'ON'

diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/pybind11"]
 	path = lib/pybind11
 	url = https://github.com/pybind/pybind11.git
+[submodule "lib/htool_generate_data_test"]
+	path = lib/htool_generate_data_test
+	url = https://github.com/PierreMarchand20/htool_generate_data_test.git
diff --git a/lib/htool_generate_data_test b/lib/htool_generate_data_test
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,5 +37,5 @@ profile = "black"
 
 
 [build-system]
-requires = ["setuptools>=42", "wheel", "cmake>=3.10", "mpi4py", "numpy"]
+requires = ["setuptools>=42", "wheel", "cmake", "mpi4py", "numpy"]
 build-backend = "setuptools.build_meta"