diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7f4e32c..3bca275 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,9 +31,6 @@ jobs: - name: POT3D Build and validation with GFortran with optimization (MPI only) shell: bash -e -x -l {0} run: | - cp src/mpi.f90 tests/pot3d/src/ - cp src/mpi_c_bindings.f90 tests/pot3d/src/ - cp src/mpi_wrapper.c tests/pot3d/src/ cd tests/pot3d FC="gfortran -O3 -march=native" ./build_and_run_gfortran.sh @@ -41,9 +38,6 @@ jobs: - name: POT3D Build and validation with GFortran without optimization (MPI only) shell: bash -e -x -l {0} run: | - cp src/mpi.f90 tests/pot3d/src/ - cp src/mpi_c_bindings.f90 tests/pot3d/src/ - cp src/mpi_wrapper.c tests/pot3d/src/ cd tests/pot3d FC="gfortran" ./build_and_run_gfortran.sh @@ -66,9 +60,6 @@ jobs: - name: POT3D Build and validation with LFortran with optimization (MPI only) shell: bash -e -x -l {0} run: | - cp src/mpi.f90 tests/pot3d/src/ - cp src/mpi_c_bindings.f90 tests/pot3d/src/ - cp src/mpi_wrapper.c tests/pot3d/src/ cd tests/pot3d FC="lfortran --fast" ./build_and_run_lfortran.sh @@ -76,8 +67,5 @@ jobs: - name: POT3D Build and validation with GFortran without optimization (MPI only) shell: bash -e -x -l {0} run: | - cp src/mpi.f90 tests/pot3d/src/ - cp src/mpi_c_bindings.f90 tests/pot3d/src/ - cp src/mpi_wrapper.c tests/pot3d/src/ cd tests/pot3d FC="lfortran" ./build_and_run_lfortran.sh diff --git a/tests/pot3d/build_and_run_gfortran.sh b/tests/pot3d/build_and_run_gfortran.sh index debf6fb..34871f4 100755 --- a/tests/pot3d/build_and_run_gfortran.sh +++ b/tests/pot3d/build_and_run_gfortran.sh @@ -7,9 +7,9 @@ else fi cd src -$CC -I$CONDA_PREFIX/include -c mpi_wrapper.c -$FC -c mpi_c_bindings.f90 -$FC -c mpi.f90 +$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_wrapper.c +$FC -c ../../../src/mpi_c_bindings.f90 +$FC -c ../../../src/mpi.f90 $FC -c psi_io.f90 $FC -c -cpp pot3d.F90 $FC mpi_wrapper.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib diff --git a/tests/pot3d/build_and_run_lfortran.sh b/tests/pot3d/build_and_run_lfortran.sh index 51b5719..48acaab 100755 --- a/tests/pot3d/build_and_run_lfortran.sh +++ b/tests/pot3d/build_and_run_lfortran.sh @@ -7,9 +7,9 @@ else fi cd src -$CC -I$CONDA_PREFIX/include -c mpi_wrapper.c -$FC -c mpi_c_bindings.f90 -$FC -c mpi.f90 +$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_wrapper.c +$FC -c ../../../src/mpi_c_bindings.f90 +$FC -c ../../../src/mpi.f90 $FC -c psi_io.f90 --no-style-warnings --no-warnings $FC -c --cpp --implicit-interface pot3d.F90 --no-style-warnings --no-warnings $FC mpi_wrapper.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib