Testing mpich Actions build

ShatrovOA · Jan 23, 2025 · 6853bd0 · 6853bd0
1 parent 12e20ec
commit 6853bd0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Create Build Directory
         run: mkdir build
-      - name: Setup and run tests
+      - name: Building
         working-directory: ./build
         run: |
           cmake -DCMAKE_C_COMPILER=gcc-14 \
@@ -29,7 +29,9 @@ jobs:
             -DDTFFT_MPI_VENDOR=openmpi \
             -DDTFFT_BUILD_C_CXX_API=on ..
           make
-          DTFFT_ENABLE_LOG=1 CTEST_OUTPUT_ON_FAILURE=1 make coverage
+      - name: Testing
+        working-directory: ./build
+        run: DTFFT_ENABLE_LOG=1 CTEST_OUTPUT_ON_FAILURE=1 make coverage
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -50,7 +52,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Create Build Directory
         run: mkdir build
-      - name: Setup and run tests
+      - name: Building
         working-directory: ./build
         run: |
           cmake -DCMAKE_C_COMPILER=gcc-13 \
@@ -63,4 +65,35 @@ jobs:
             -DDTFFT_BUILD_SHARED=off \
             -DDTFFT_BUILD_C_CXX_API=on ..
           make
-          DTFFT_ENABLE_LOG=1 CTEST_OUTPUT_ON_FAILURE=1 make coverage
+      - name: Testing
+        working-directory: ./build
+        run: DTFFT_ENABLE_LOG=1 CTEST_OUTPUT_ON_FAILURE=1 make test
+
+  mpich_macos:
+    name: macOS MPICH with persistent communications
+    runs-on: macos-latest
+    steps:
+      - name: Get Requirements
+        run: |
+          brew install fftw
+          brew install mpich
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Create Build Directory
+        run: mkdir build
+      - name: Building
+        working-directory: ./build
+        run: |
+          cmake -DCMAKE_C_COMPILER=gcc-12 \
+            -DCMAKE_CXX_COMPILER=g++-12 \
+            -DCMAKE_Fortran_COMPILER=gfortran-12 \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DDTFFT_RUNNING_CICD=on \
+            -DDTFFT_WITH_FFTW=on \
+            -DDTFFT_ENABLE_PERSISTENT_COMM=on \
+            -DDTFFT_BUILD_SHARED=on \
+            -DDTFFT_BUILD_C_CXX_API=off ..
+          make
+      - name: Testing
+        working-directory: ./build
+        run: DTFFT_ENABLE_LOG=1 CTEST_OUTPUT_ON_FAILURE=1 make test
diff --git a/tests/c/test_c2c_3d_float_cxx.cpp b/tests/c/test_c2c_3d_float_cxx.cpp
@@ -76,9 +76,11 @@ int main(int argc, char *argv[])
   executor_type = DTFFT_EXECUTOR_NONE;
 #endif
 
+  dtfft_disable_z_slab();
   dtfft::PlanC2C plan(dims, grid_comm, DTFFT_SINGLE, DTFFT_MEASURE, executor_type);
   vector<int> in_counts(3);
   plan.get_local_sizes(NULL, in_counts.data());
+  dtfft_enable_z_slab();
 
   size_t in_size = std::accumulate(in_counts.begin(), in_counts.end(), 1, multiplies<int>());