Skip to content

Commit 9f323be

Browse files
authored
Merge pull request #73 from certik/up4
Update LFortran to 0.57.0
2 parents f08aae4 + 9f0e2e5 commit 9f323be

1 file changed

Lines changed: 19 additions & 14 deletions

File tree

.github/workflows/CI.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313

1414
env:
15-
LFORTRAN_VERSION: 0.56.0
15+
LFORTRAN_VERSION: 0.57.0
1616
MACOSX_DEPLOYMENT_TARGET: 15.0
1717

1818
jobs:
@@ -174,7 +174,7 @@ jobs:
174174
175175
mkdir lf
176176
cd lf
177-
FC=lfortran CMAKE_PREFIX_PATH=$CONDA_PREFIX cmake -DFASTGPT_BLAS=OpenBLAS -DCMAKE_BUILD_TYPE=Debug ..
177+
FC="lfortran --realloc-lhs-arrays" CMAKE_PREFIX_PATH=$CONDA_PREFIX cmake -DFASTGPT_BLAS=OpenBLAS -DCMAKE_BUILD_TYPE=Debug ..
178178
make VERBOSE=1
179179
ln -s ../model.dat .
180180
./gpt2
@@ -184,7 +184,7 @@ jobs:
184184
185185
mkdir lf-fast
186186
cd lf-fast
187-
FC="lfortran --fast" CMAKE_PREFIX_PATH=$CONDA_PREFIX cmake -DFASTGPT_BLAS=OpenBLAS -DCMAKE_BUILD_TYPE=Release ..
187+
FC="lfortran --fast --realloc-lhs-arrays" CMAKE_PREFIX_PATH=$CONDA_PREFIX cmake -DFASTGPT_BLAS=OpenBLAS -DCMAKE_BUILD_TYPE=Release ..
188188
make VERBOSE=1
189189
ln -s ../model.dat .
190190
./gpt2
@@ -200,7 +200,7 @@ jobs:
200200
201201
git checkout lf20
202202
git checkout abb1d33d6ae02d8b62a13be7f9e51f6117c67ba4
203-
FC=lfortran cmake . -DTEST_DRIVE_BUILD_TESTING=OFF -DBUILD_EXAMPLE=ON -DCMAKE_Fortran_COMPILER_WORKS=TRUE -DCMAKE_Fortran_FLAGS="--cpp --realloc-lhs"
203+
FC=lfortran cmake . -DTEST_DRIVE_BUILD_TESTING=OFF -DBUILD_EXAMPLE=ON -DCMAKE_Fortran_COMPILER_WORKS=TRUE -DCMAKE_Fortran_FLAGS="--cpp --realloc-lhs-arrays"
204204
make -j2
205205
ctest
206206
cd ..
@@ -226,17 +226,22 @@ jobs:
226226
if: ${{ startsWith(matrix.os, 'ubuntu') }}
227227
shell: bash -e -l {0}
228228
run: |
229-
git clone https://github.com/gxyd/pot3d.git
229+
git clone https://github.com/parth121101/pot3d.git
230230
cd pot3d
231-
# Only workarounds used now are (also tracked at: https://github.com/lfortran/lfortran/issues/2862):
232-
# 1. HDF5 support replaced with binary file read (see: https://github.com/lfortran/lfortran/issues/6561)
233-
# 2. namelist reading support replaced with use of file read (see: https://github.com/lfortran/lfortran/issues/1999)
234-
# 3. MPI support replaced with custom MPI wrappers (we've C MPI wrappers from https://github.com/gxyd/c_mpi)
235-
# 4. moved global procedures to module procedures (see: https://github.com/lfortran/lfortran/issues/6059)
236-
git checkout -t origin/lf_hdf5_mpi_namelist_global_workarounds
237-
git checkout 337546b13502ed1c07a0a38cba3afe1a9f35fb27
238-
FC="lfortran" ./build_and_run.sh
239-
FC="lfortran --fast --skip-pass=dead_code_removal" ./build_and_run.sh
231+
git checkout -t origin/lf_hdf5_fortranMPI_namelist_global_workarounds
232+
git checkout 380669edd3a5947985674a51e0d65482d6fe68b3
233+
234+
git clone https://github.com/lfortran/fortran_mpi
235+
cd fortran_mpi
236+
git checkout 31033d3c8af32c4c99fac803c161e6731bc39a78
237+
cp src/mpi.f90 ../src/
238+
cp src/mpi_c_bindings.f90 ../src/
239+
cp src/mpi_constants.c ../src/
240+
cd ..
241+
FC="lfortran --cpp -DOPEN_MPI=yes" ./build_and_run_lfortran.sh
242+
FC="lfortran --cpp --fast --skip-pass=dead_code_removal -DOPEN_MPI=yes" ./build_and_run_lfortran.sh
243+
FC="lfortran --cpp --separate-compilation -DOPEN_MPI=yes" ./build_and_run_lfortran.sh
244+
cd ..
240245
241246
- name: Test PRIMA
242247
shell: bash -e -l {0}

0 commit comments

Comments
 (0)