AMReX: ROCMClang CMake (#2120)

* AMReX: 91fa2b7e6ff33117bd537635c8c55192359863a2 Include HIP ROCMClang recog. in AMReX: AMReX-Codes/amrex#2184 * HIP CI: Use clang++ directly Looks like the C++14 flags are missing
ECP-WarpX · Jul 21, 2021 · 3712021 · 3712021
1 parent 08afd5e
commit 3712021
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/dependencies/hip.sh b/.github/workflows/dependencies/hip.sh
@@ -15,7 +15,7 @@ wget -q -O - http://repo.radeon.com/rocm/rocm.gpg.key \
 echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/4.1.1/ xenial main' \
   | sudo tee /etc/apt/sources.list.d/rocm.list
 
-echo 'export PATH=$PATH:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin' \
+echo 'export PATH=/opt/rocm-4.1.1/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
   | sudo tee -a /etc/profile.d/rocm.sh
 # we should not need to export HIP_PATH=/opt/rocm/hip with those installs
 
@@ -40,6 +40,8 @@ sudo apt-get install -y --no-install-recommends \
 #
 source /etc/profile.d/rocm.sh
 hipcc --version
+which clang
+which clang++
 
 # cmake-easyinstall
 #

diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml
@@ -6,7 +6,7 @@ jobs:
   build_hip:
     name: HIP SP
     runs-on: ubuntu-20.04
-    env: {CXXFLAGS: "-Werror -Wno-deprecated-declarations"}
+    env: {CXXFLAGS: "-Werror -Wno-deprecated-declarations -Wno-error=pass-failed"}
     steps:
     - uses: actions/checkout@v2
     - name: install dependencies
@@ -17,7 +17,9 @@ jobs:
       run: |
         source /etc/profile.d/rocm.sh
         hipcc --version
-        export CXX=$(which hipcc)
+        which clang
+        which clang++
+        export CXX=$(which clang++)
         export CC=$(which clang)
 
         cmake -S . -B build_sp \

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
@@ -231,7 +231,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "ee8facf7e09d0b40af1fe680665660c24a19d32a"
+set(WarpX_amrex_branch "91fa2b7e6ff33117bd537635c8c55192359863a2"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

diff --git a/run_test.sh b/run_test.sh
@@ -51,7 +51,7 @@ echo "cd $PWD"
 
 # Clone PICSAR, AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout ee8facf7e09d0b40af1fe680665660c24a19d32a && cd -
+cd amrex && git checkout 91fa2b7e6ff33117bd537635c8c55192359863a2 && cd -
 # Use QED brach for QED tests
 git clone https://github.com/ECP-WarpX/picsar.git
 cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd -