From da05c67f605472c60ab65a60f308a833d8ea7597 Mon Sep 17 00:00:00 2001 From: edoapra Date: Wed, 6 Mar 2024 18:15:39 -0800 Subject: [PATCH] added flang-new-18 --- .github/workflows/github_actions.yml | 6 ++++++ travis/build_env.sh | 7 ++++--- travis/nwchem.bashrc | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index 4268ad33be..92e453a6fa 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -388,6 +388,12 @@ jobs: armci_network: MPI-TS nwchem_modules: "tinyqmpw" fc: flang-new-17 + - os: ubuntu-latest + experimental: true + mpi_impl: mpich + armci_network: MPI-TS + nwchem_modules: "tinyqmpw" + fc: flang-new-18 - os: ubuntu-22.04 experimental: true mpi_impl: openmpi diff --git a/travis/build_env.sh b/travis/build_env.sh index bc12a471d7..c984cb65f6 100755 --- a/travis/build_env.sh +++ b/travis/build_env.sh @@ -222,11 +222,12 @@ if [[ "$os" == "Linux" ]]; then icc -V fi - if [[ "$FC" == "flang-new-17" ]]; then + if [[ "$FC" == 'flang-new-'* ]]; then wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - $MYSUDO ./llvm.sh 17 - $MYSUDO apt-get install -y flang-17 + llvm_ver=$(echo $FC | cut -d - -f 3) + $MYSUDO ./llvm.sh $llvm_ver + $MYSUDO apt-get install -y flang-$llvm_ver fi if [[ "$FC" == "flang" ]]; then if [[ "USE_AOMP" == "Y" ]]; then diff --git a/travis/nwchem.bashrc b/travis/nwchem.bashrc index f12d958e18..a53d48dee4 100644 --- a/travis/nwchem.bashrc +++ b/travis/nwchem.bashrc @@ -39,7 +39,7 @@ if [[ "$FC" == "amdflang" ]]; then export LD_LIBRARY_PATH=/opt/rocm-"$rocm_version"/lib:/opt/rocm/llvm/lib:$LD_LIBRARY_PATH export BUILD_MPICH=1 fi -if [[ "$FC" == "flang-new-17" ]]; then +if [[ "$FC" == 'flang-new-'* ]]; then export BUILD_MPICH=1 fi