remove openmp from macos x86-64 as well

ar4 · Jul 22, 2023 · 84fe01b · 84fe01b
1 parent 22d838a
commit 84fe01b
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 148 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,65 +1,46 @@
 name: Build and test
 on: push
 jobs:
-#    Linux-build:
-#        runs-on: ubuntu-latest
-#        container: quay.io/pypa/manylinux2014_x86_64
-#        steps:
-#            - name: Checkout
-#              uses: actions/checkout@v3
-#            - name: Install NVCC
-#              run: |
-#                yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
-#                yum install -y cuda-nvcc-11-1-11.1.105-1 cuda-cudart-devel-11-1-11.1.74-1
-#            - name: Compile
-#              run: |
-#                PATH=$PATH:/usr/local/cuda-11.1/bin
-#                CUDA_HOME=/usr/local/cuda-11.1
-#                CUDA_ROOT=/usr/local/cuda-11.1
-#                CUDA_PATH=/usr/local/cuda-11.1
-#                CUDADIR=/usr/local/cuda-11.1
-#                LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-11.1/lib64
-#                cd src/deepwave
-#                cp /lib64/libgomp.so.1 .
-#                ./build_linux.sh
-#            - name: Archive built libraries
-#              uses: actions/upload-artifact@v3
-#              with:
-#                name: linux_libraries
-#                path: src/deepwave/*.so*
+    Linux-build:
+        runs-on: ubuntu-latest
+        container: quay.io/pypa/manylinux2014_x86_64
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Install NVCC
+              run: |
+                yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
+                yum install -y cuda-nvcc-11-1-11.1.105-1 cuda-cudart-devel-11-1-11.1.74-1
+            - name: Compile
+              run: |
+                PATH=$PATH:/usr/local/cuda-11.1/bin
+                CUDA_HOME=/usr/local/cuda-11.1
+                CUDA_ROOT=/usr/local/cuda-11.1
+                CUDA_PATH=/usr/local/cuda-11.1
+                CUDADIR=/usr/local/cuda-11.1
+                LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-11.1/lib64
+                cd src/deepwave
+                cp /lib64/libgomp.so.1 .
+                ./build_linux.sh
+            - name: Archive built libraries
+              uses: actions/upload-artifact@v3
+              with:
+                name: linux_libraries
+                path: src/deepwave/*.so*
     MacOS-build:
         runs-on: macos-11
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-            - name: Set up Python
-              uses: actions/setup-python@v3
-#            - name: Install dependencies
-#              run: |
-#                #ls -R
-#                #python -m pip install torch
             - name: Compile
               run: |
                 cd src/deepwave
-                #cp `python -c "import torch; print(torch.__path__[0])"`/lib/libiomp5.dylib .
-                nuget install intelopenmp.devel.osx -DirectDownload -NonInteractive
-                cp intelopenmp.devel.osx*/lib/native/osx-x64/libiomp5.dylib .
-                brew install libomp
                 ./build_macos.sh
-                cd ../../
-                python -m pip install --upgrade pip
-                python -m pip install pytest scipy
-                python -m pip install .
-            - name: Test with pytest
-              run: |
-                #pytest -s
-                cd tests
-                PYTHONVERBOSE=3 python -c "import test_elastic; test_elastic.test_wavefield_decays()"
-#            - name: Archive built libraries
-#              uses: actions/upload-artifact@v3
-#              with:
-#                name: macos_libraries
-#                path: src/deepwave/*.dylib
+            - name: Archive built libraries
+              uses: actions/upload-artifact@v3
+              with:
+                name: macos_libraries
+                path: src/deepwave/*.dylib
     Windows-build:
         runs-on: windows-2019
         defaults:
@@ -68,15 +49,13 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-#            - name: Set up Python
-#              uses: actions/setup-python@v3
-#            - name: Install NVCC
-#              run: |
-#                curl https://developer.download.nvidia.com/compute/cuda/11.1.1/network_installers/cuda_11.1.1_win10_network.exe -o cuda_11.1.1_win10_network.exe
-#                chmod +x ./cuda_11.1.1_win10_network.exe
-#                ./cuda_11.1.1_win10_network.exe -s nvcc_11.1 cudart_11.1
-#                echo "CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.1" >> $GITHUB_ENV
-#                echo "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.1\\bin" >> $GITHUB_PATH
+            - name: Install NVCC
+              run: |
+                curl https://developer.download.nvidia.com/compute/cuda/11.1.1/network_installers/cuda_11.1.1_win10_network.exe -o cuda_11.1.1_win10_network.exe
+                chmod +x ./cuda_11.1.1_win10_network.exe
+                ./cuda_11.1.1_win10_network.exe -s nvcc_11.1 cudart_11.1
+                echo "CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.1" >> $GITHUB_ENV
+                echo "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.1\\bin" >> $GITHUB_PATH
             - name: Setup MSVC
               uses: ilammy/msvc-dev-cmd@v1
             - name: Compile
@@ -87,43 +66,42 @@ jobs:
                 cp intelopenmp.devel.win*/lib/native/win-x64/libiomp5md.lib .
                 cp intelopenmp.redist.win*/runtimes/win-x86/native/libiomp5md.dll .
                 ./build_windows.sh
-#            - name: Archive built libraries
-#              uses: actions/upload-artifact@v3
-#              with:
-#                name: windows_libraries
-#                path: src/deepwave/*.dll
-#    Test:
-#        strategy:
-#            matrix:
-#                os: [ubuntu-latest, macos-latest, windows-latest]
-#            fail-fast: false
-#        runs-on: ${{ matrix.os }}
-#        needs: [Linux-build, MacOS-build, Windows-build]
-#        steps:
-#            - name: Checkout
-#              uses: actions/checkout@v3
-#            - name: Download built Linux libraries
-#              uses: actions/download-artifact@v3
-#              with:
-#                name: linux_libraries
-#                path: src/deepwave/
-#            - name: Download built MacOS libraries
-#              uses: actions/download-artifact@v3
-#              with:
-#                name: macos_libraries
-#                path: src/deepwave/
-#            - name: Download built Windows libraries
-#              uses: actions/download-artifact@v3
-#              with:
-#                name: windows_libraries
-#                path: src/deepwave/
-#            - name: Set up Python
-#              uses: actions/setup-python@v3
-#            - name: Install dependencies
-#              run: |
-#                python -m pip install --upgrade pip
-#                python -m pip install pytest scipy
-#                python -m pip install .
-#            - name: Test with pytest
-#              run: |
-#                PYTHONVERBOSE=3 pytest
+            - name: Archive built libraries
+              uses: actions/upload-artifact@v3
+              with:
+                name: windows_libraries
+                path: src/deepwave/*.dll
+    Test:
+        strategy:
+            matrix:
+                os: [ubuntu-latest, macos-latest, windows-latest]
+            fail-fast: false
+        runs-on: ${{ matrix.os }}
+        needs: [Linux-build, MacOS-build, Windows-build]
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Download built Linux libraries
+              uses: actions/download-artifact@v3
+              with:
+                name: linux_libraries
+                path: src/deepwave/
+            - name: Download built MacOS libraries
+              uses: actions/download-artifact@v3
+              with:
+                name: macos_libraries
+                path: src/deepwave/
+            - name: Download built Windows libraries
+              uses: actions/download-artifact@v3
+              with:
+                name: windows_libraries
+                path: src/deepwave/
+            - name: Set up Python
+              uses: actions/setup-python@v3
+            - name: Install dependencies
+              run: |
+                python -m pip install --upgrade pip
+                python -m pip install pytest scipy
+                python -m pip install .
+            - name: Test with pytest
+              run: pytest
diff --git a/src/deepwave/build_macos.sh b/src/deepwave/build_macos.sh
@@ -2,8 +2,7 @@
 
 set -e
 
-DW_OMP_NAME=iomp5
-CFLAGS="-Wall -Wextra -pedantic -fPIC -Ofast -Xpreprocessor -fopenmp -I`brew --prefix libomp`/include"
+CFLAGS="-Wall -Wextra -pedantic -fPIC -Ofast"
 clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_2_float.o
 clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_4_float.o
 clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_6_float.o
@@ -24,28 +23,28 @@ clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_2
 clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_4_float.o
 clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_2_double.o
 clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_4_double.o
-clang $CFLAGS -dynamiclib scalar_born_cpu_iso_2_float.o scalar_born_cpu_iso_4_float.o scalar_born_cpu_iso_6_float.o scalar_born_cpu_iso_8_float.o scalar_born_cpu_iso_2_double.o scalar_born_cpu_iso_4_double.o scalar_born_cpu_iso_6_double.o scalar_born_cpu_iso_8_double.o scalar_cpu_iso_2_float.o scalar_cpu_iso_4_float.o scalar_cpu_iso_6_float.o scalar_cpu_iso_8_float.o scalar_cpu_iso_2_double.o scalar_cpu_iso_4_double.o scalar_cpu_iso_6_double.o scalar_cpu_iso_8_double.o elastic_cpu_iso_2_float.o elastic_cpu_iso_4_float.o elastic_cpu_iso_2_double.o elastic_cpu_iso_4_double.o -L. -l$DW_OMP_NAME -rpath @loader_path/ -o libdeepwave_cpu_macos_x86_64.dylib
+clang $CFLAGS -dynamiclib scalar_born_cpu_iso_2_float.o scalar_born_cpu_iso_4_float.o scalar_born_cpu_iso_6_float.o scalar_born_cpu_iso_8_float.o scalar_born_cpu_iso_2_double.o scalar_born_cpu_iso_4_double.o scalar_born_cpu_iso_6_double.o scalar_born_cpu_iso_8_double.o scalar_cpu_iso_2_float.o scalar_cpu_iso_4_float.o scalar_cpu_iso_6_float.o scalar_cpu_iso_8_float.o scalar_cpu_iso_2_double.o scalar_cpu_iso_4_double.o scalar_cpu_iso_6_double.o scalar_cpu_iso_8_double.o elastic_cpu_iso_2_float.o elastic_cpu_iso_4_float.o elastic_cpu_iso_2_double.o elastic_cpu_iso_4_double.o -o libdeepwave_cpu_macos_x86_64.dylib
+rm *.o
+CFLAGS="-Wall -Wextra -pedantic -fPIC -Ofast -arch arm64"
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_2_float.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_4_float.o
+clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_6_float.o
+clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_8_float.o
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_2_double.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_4_double.o
+clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_6_double.o
+clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_8_double.o
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_2_float.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_4_float.o
+clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_6_float.o
+clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_8_float.o
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_2_double.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_4_double.o
+clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_6_double.o
+clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_8_double.o
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_2_float.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_4_float.o
+clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_2_double.o
+clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_4_double.o
+clang $CFLAGS -shared scalar_born_cpu_iso_2_float.o scalar_born_cpu_iso_4_float.o scalar_born_cpu_iso_6_float.o scalar_born_cpu_iso_8_float.o scalar_born_cpu_iso_2_double.o scalar_born_cpu_iso_4_double.o scalar_born_cpu_iso_6_double.o scalar_born_cpu_iso_8_double.o scalar_cpu_iso_2_float.o scalar_cpu_iso_4_float.o scalar_cpu_iso_6_float.o scalar_cpu_iso_8_float.o scalar_cpu_iso_2_double.o scalar_cpu_iso_4_double.o scalar_cpu_iso_6_double.o scalar_cpu_iso_8_double.o elastic_cpu_iso_2_float.o elastic_cpu_iso_4_float.o elastic_cpu_iso_2_double.o elastic_cpu_iso_4_double.o -o libdeepwave_cpu_macos_arm64.dylib
 rm *.o
-#CFLAGS="-Wall -Wextra -pedantic -fPIC -Ofast -arch arm64"
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_2_float.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_4_float.o
-#clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_6_float.o
-#clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=float -c scalar.c -o scalar_cpu_iso_8_float.o
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_2_double.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_4_double.o
-#clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_6_double.o
-#clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=double -c scalar.c -o scalar_cpu_iso_8_double.o
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_2_float.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_4_float.o
-#clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_6_float.o
-#clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=float -c scalar_born.c -o scalar_born_cpu_iso_8_float.o
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_2_double.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_4_double.o
-#clang $CFLAGS -DDW_ACCURACY=6 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_6_double.o
-#clang $CFLAGS -DDW_ACCURACY=8 -DDW_DTYPE=double -c scalar_born.c -o scalar_born_cpu_iso_8_double.o
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_2_float.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=float -c elastic.c -o elastic_cpu_iso_4_float.o
-#clang $CFLAGS -DDW_ACCURACY=2 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_2_double.o
-#clang $CFLAGS -DDW_ACCURACY=4 -DDW_DTYPE=double -c elastic.c -o elastic_cpu_iso_4_double.o
-#clang $CFLAGS -shared scalar_born_cpu_iso_2_float.o scalar_born_cpu_iso_4_float.o scalar_born_cpu_iso_6_float.o scalar_born_cpu_iso_8_float.o scalar_born_cpu_iso_2_double.o scalar_born_cpu_iso_4_double.o scalar_born_cpu_iso_6_double.o scalar_born_cpu_iso_8_double.o scalar_cpu_iso_2_float.o scalar_cpu_iso_4_float.o scalar_cpu_iso_6_float.o scalar_cpu_iso_8_float.o scalar_cpu_iso_2_double.o scalar_cpu_iso_4_double.o scalar_cpu_iso_6_double.o scalar_cpu_iso_8_double.o elastic_cpu_iso_2_float.o elastic_cpu_iso_4_float.o elastic_cpu_iso_2_double.o elastic_cpu_iso_4_double.o -o libdeepwave_cpu_macos_arm64.dylib
-#rm *.o