From 43b1ceda48ca8c95550ef5d2ca13c757e71bb4dc Mon Sep 17 00:00:00 2001
From: Sebastian Grimberg <sjg@amazon.com>
Date: Mon, 28 Aug 2023 18:12:16 -0700
Subject: [PATCH] Updates to fix AMD AOCL CI builds

---
 .github/workflows/build-and-test-linux.yml | 26 +++++-----------------
 .gitlab-ci.yml                             | 23 ++++---------------
 2 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build-and-test-linux.yml b/.github/workflows/build-and-test-linux.yml
index 41c0bc124..c0337cba3 100644
--- a/.github/workflows/build-and-test-linux.yml
+++ b/.github/workflows/build-and-test-linux.yml
@@ -126,25 +126,9 @@ jobs:
       - name: Install math libraries (AOCL)
         if: matrix.math-libs == 'aocl'
         run: |
-          wget https://github.com/amd/blis/archive/refs/tags/4.0.tar.gz
-          tar -xzf 4.0.tar.gz && cd blis-4.0
-          [[ "${{ matrix.with-openmp }}" == 'openmp' ]] && THREADING='openmp' || THREADING='no'
-          ./configure --prefix=/opt/amd \
-                      --enable-arg-max-hack \
-                      --disable-static --enable-shared \
-                      --enable-blas --enable-cblas \
-                      --enable-threading=$THREADING \
-                      auto
-          make -j && sudo make install
-          cd .. && rm -rf 4.0.tar.gz blis-*
-          wget https://github.com/amd/libflame/archive/refs/tags/4.0.tar.gz
-          tar -xzf 4.0.tar.gz && cd libflame-4.0
-          ./configure --prefix=/opt/amd \
-                      --enable-max-arg-list-hack \
-                      --disable-static-build --enable-dynamic-build \
-                      --enable-lapack2flame
-          make -j && sudo make install
-          cd .. && rm -rf 4.0.tar.gz libflame-*
+          wget https://download.amd.com/developer/eula/aocl/aocl-4-1/aocl-linux-gcc-4.1.0_1_amd64.deb
+          sudo apt-get install -y ./aocl-linux-gcc-4.1.0_1_amd64.deb
+          rm aocl-linux-gcc-*.deb
 
       - name: Build Palace
         env:
@@ -172,7 +156,7 @@ jobs:
             export FC=gfortran-11
           fi
           if [[ "${{ matrix.math-libs }}" == 'aocl' ]]; then
-            export AOCLROOT=/opt/amd
+            export AOCLROOT=/opt/AMD/aocl/aocl-linux-gcc-4.1.0/gcc
             export LD_LIBRARY_PATH=$AOCLROOT/lib:$LD_LIBRARY_PATH
           fi
           export NUM_PROC_BUILD=$(nproc 2> /dev/null || sysctl -n hw.ncpu)
@@ -225,7 +209,7 @@ jobs:
             export OMP_NUM_THREADS=1
           fi
           if [[ "${{ matrix.math-libs }}" == 'aocl' ]]; then
-            export AOCLROOT=/opt/amd
+            export AOCLROOT=/opt/AMD/aocl/aocl-linux-gcc-4.1.0/gcc
             export LD_LIBRARY_PATH=$AOCLROOT/lib:$LD_LIBRARY_PATH
           fi
           export PATH=$(pwd)/palace-install/bin:$PATH
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28f5a5ca2..887dc2086 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,25 +168,10 @@ test-build-aocl:
   script:
     # Install AMD Optimizing CPU Libraries (AOCL)
     - apt-get install -y libmpich-dev
-    - wget https://github.com/amd/blis/archive/refs/tags/4.0.tar.gz
-    - tar -xzf 4.0.tar.gz && cd blis-4.0
-    - ./configure --prefix=/opt/amd
-                  --enable-arg-max-hack
-                  --disable-static --enable-shared
-                  --enable-blas --enable-cblas
-                  --enable-threading=no
-                  auto
-    - make -j$NUM_PROC_BUILD && make install
-    - cd .. && rm -rf 4.0.tar.gz blis-*
-    - wget https://github.com/amd/libflame/archive/refs/tags/4.0.tar.gz
-    - tar -xzf 4.0.tar.gz && cd libflame-4.0
-    - ./configure --prefix=/opt/amd
-                  --enable-max-arg-list-hack
-                  --disable-static-build --enable-dynamic-build
-                  --enable-lapack2flame
-    - make -j$NUM_PROC_BUILD && make install
-    - cd .. && rm -rf 4.0.tar.gz libflame-*
-    - export AOCLROOT=/opt/amd
+    - wget https://download.amd.com/developer/eula/aocl/aocl-4-1/aocl-linux-gcc-4.1.0_1_amd64.deb
+    - apt-get install -y ./aocl-linux-gcc-4.1.0_1_amd64.deb
+    - rm aocl-linux-gcc-*.deb
+    - export AOCLROOT=/opt/AMD/aocl/aocl-linux-gcc-4.1.0/gcc
     - export LD_LIBRARY_PATH=$AOCLROOT/lib:$LD_LIBRARY_PATH
     - mkdir build && cd build
     - cmake ..