Merge branch 'master' into photonfield

CRPropa · Mar 13, 2024 · 4cf8d27 · 4cf8d27
2 parents 2d48f5d + 1ffe835
commit 4cf8d27
Show file tree

Hide file tree

Showing 27 changed files with 677 additions and 1,081 deletions.
diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml
@@ -9,22 +9,18 @@ jobs:
       fail-fast: false
       matrix:
         config:
-         - name: "ubuntu-20"
-           os: ubuntu-20.04
-           cxx: "g++-9"
-           cc: "gcc-9"
-           fc: "gfortran-9"
-           swig_builtin: "Off" #uses swig 4.0.1
+          - name: "ubuntu-22"
+            os: ubuntu-22.04
+            cxx: "g++-11"
+            cc: "gcc-11"
+            fc: "gfortran-11"
+            swig_builtin: "On" #uses swig 4.0.2
+            py: "/usr/bin/python3" #python 3.10
 
     # define steps to take
     steps: 
       - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Python install
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          cache: 'pip' # caching pip dependencies
+        uses: actions/checkout@v4
       - name: Prerequirements
         run: |
           sudo apt-get update
@@ -40,9 +36,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local \
-            -DENABLE_PYTHON=True -DENABLE_TESTING=ON -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} \
-            -DSIMD_EXTENSIONS=native -DBUILD_DOC=True -DENABLE_COVERAGE=True
+          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On
       - name: Build CRPropa
         run: |
           cd build
@@ -63,7 +57,7 @@ jobs:
           make doc
           tar -zcvf documentation.tar.gz doc
       - name: archive documentation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "documentation"
           path: | 

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -8,20 +8,20 @@ jobs:
       fail-fast: false
       matrix:
         config:
-         - name: "ubuntu-20"
-           os: ubuntu-20.04
-           cxx: "g++-9"
-           cc: "gcc-9"
-           fc: "gfortran-9"
-           swig_builtin: "Off" #uses swig 4.0.1
-           py: "/usr/bin/python3" #python 3.8
+         - name: "ubuntu-22"
+           os: ubuntu-22.04
+           cxx: "g++-11"
+           cc: "gcc-11"
+           fc: "gfortran-11"
+           swig_builtin: "On" #uses swig 4.0.2
+           py: "/usr/bin/python3" #python 3.10
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Preinstall
         run: |
           sudo apt-get update
-          sudo apt-get install libmuparser-dev python3-dev python-dev python3-numpy python-numpy python3-setuptools python-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
+          sudo apt-get install libmuparser-dev python3 python3-dev python3-numpy python3-setuptools python-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
           pip3 install -r doc/pages/example_notebooks/requirements.txt # load requrements for notebooks
           pip3 install --upgrade Pygments
           pip3 install --upgrade numpy
@@ -33,14 +33,14 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/
       - name: Build CRPropa
         run: |
           cd build
           make install -j
       - name: convert notebooks to python 
         env: 
-          PYTHONPATH: "/home/runner/.local/lib/python3.8/site-packages/"
+          PYTHONPATH: "/home/runner/.local"
           runfolder: "/home/runner/notebook_run"
         run: |
           mkdir "$runfolder"
@@ -58,7 +58,7 @@ jobs:
           done
       - name: run all python scripts
         env: 
-          PYTHONPATH: "$/home/runner/.local/lib/python3.8/site-packages/"
+          PYTHONPATH: "/home/runner/.local"
           runfolder: "/home/runner/notebook_run"
         run: | 
           cp doc/pages/example_notebooks/galactic_lensing/crpropa_output.txt "$runfolder"/

diff --git a/.github/workflows/testing_OSX.yaml → .github/workflows/testing_OSX.yml b/.github/workflows/testing_OSX.yaml → .github/workflows/testing_OSX.yml
@@ -7,19 +7,19 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "macos-11"
-            os: macos-11
+          - name: "macos-14"
+            os: macos-14 
             cxx: "clang++"
             cc: "clang"
             fc: "gfortran-11"
             swig_builtin: "On" #uses swig 4.0.2
-            py: "/usr/bin/python"
+            py: "/usr/bin/python3"
     steps:
      - name: Checkout repository 
-       uses: actions/checkout@v3 
+       uses: actions/checkout@v4 
      - name: Preinstall 
        run: | 
-         brew install hdf5 fftw cfitsio muparser libomp
+         brew install hdf5 fftw cfitsio muparser libomp numpy swig
      - name: Set up the build
        env:
          CXX: ${{ matrix.config.cxx }}
@@ -29,7 +29,7 @@ jobs:
        run: |
         mkdir build
         cd build
-        cmake .. -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=avx
+        cmake .. -DENABLE_PYTHON=True  -DENABLE_TESTING=On  -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
      - name: Build CRPropa
        run: |
          cd build
@@ -42,7 +42,7 @@ jobs:
          make test
      - name: Archive test results
        if: always()
-       uses: actions/upload-artifact@v3
+       uses: actions/upload-artifact@v4
        with:
          name: "test-report_${{matrix.config.name}}"
          path: build/Testing/Temporary/LastTest.log
diff --git a/.github/workflows/testing.yml → .github/workflows/testing_ubuntu20.yml b/.github/workflows/testing.yml → .github/workflows/testing_ubuntu20.yml
@@ -1,4 +1,4 @@
-name: crpropa-testing
+name: crpropa-testing_ubuntu20
 on: [push, pull_request]
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
            py: "/usr/bin/python3" #python 3.8
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Preinstall
         run: |
           sudo apt-get update
@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On  -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
       - name: Build CRPropa
         run: |
           cd build
@@ -41,7 +41,7 @@ jobs:
           make test
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "test-report_${{matrix.config.name}}"
           path: build/Testing/Temporary/LastTest.log
diff --git a/.github/workflows/testing_ubuntu22.yml b/.github/workflows/testing_ubuntu22.yml
@@ -17,7 +17,7 @@ jobs:
            py: "/usr/bin/python3" #python 3.10
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Preinstall
         run: |
           sudo apt-get update
@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
       - name: Build CRPropa
         run: |
           cd build
@@ -41,7 +41,7 @@ jobs:
           make test
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "test-report_${{matrix.config.name}}"
           path: build/Testing/Temporary/LastTest.log