Get ARM GPU build to work agin

milot-mirdita · milot-mirdita · commit 0eb08bf6f1c7 · 2025-06-21T11:27:05.000+02:00
diff --git a/.github/workflows/Dockerfile.GPU-buster-cross-sbsa b/.github/workflows/Dockerfile.GPU-buster-cross-sbsa
@@ -19,7 +19,6 @@ WORKDIR /work
 RUN wget https://apt.llvm.org/llvm.sh
 RUN chmod +x llvm.sh
 RUN ./llvm.sh 20
-ADD . .
 RUN echo "set(CMAKE_SYSTEM_NAME Linux)" > /work/toolchain.cmake; \
     echo "set(CMAKE_SYSTEM_PROCESSOR aarch64)" >> /work/toolchain.cmake; \
     echo "set(CMAKE_C_COMPILER /work/clang-aarch64)" >> /work/toolchain.cmake; \
@@ -28,14 +27,33 @@ RUN echo "set(CMAKE_SYSTEM_NAME Linux)" > /work/toolchain.cmake; \
     echo "set(CMAKE_CUDA_COMPILER /usr/local/cuda/bin/nvcc)" >> /work/toolchain.cmake; \
     echo 'set(CMAKE_CUDA_FLAGS "-t 0 --split-compile=0 -allow-unsupported-compiler")' >> /work/toolchain.cmake; \
     echo 'set(CMAKE_CUDA_LINK_FLAGS "-t 0 --split-compile=0 -allow-unsupported-compiler")' >> /work/toolchain.cmake; \
-    echo -e '#!/bin/sh\n/usr/bin/clang-20 --target=aarch64-linux-gnu "${@}"\n' > /work/clang-aarch64; \
-    echo -e '#!/bin/sh\n/usr/bin/clang++-20 --target=aarch64-linux-gnu "${@}"\n' > /work/clang++-aarch64; \
-    chmod +x /work/clang-aarch64 /work/clang++-aarch64;
+    echo '#!/bin/sh\n/usr/bin/clang-20 --target=aarch64-linux-gnu "${@}"\n' > /work/clang-aarch64; \
+    echo '#!/bin/sh\n/usr/bin/clang++-20 --target=aarch64-linux-gnu "${@}"\n' > /work/clang++-aarch64; \
+    chmod +x /work/clang-aarch64 /work/clang++-aarch64; \
+    cat /work/clang-aarch64 /work/clang++-aarch64;
+
+ENV OMPVERSION=20.1.7
+ENV LIBOMP_AARCH64="/work/build_libomp/openmp-${OMPVERSION}.src/build-arm64/runtime/src"
+RUN mkdir -p build_libomp && cd build_libomp; \
+    wget -qO- https://github.com/llvm/llvm-project/releases/download/llvmorg-${OMPVERSION}/cmake-${OMPVERSION}.src.tar.xz | tar xJvf -; \
+    wget -qO- https://github.com/llvm/llvm-project/releases/download/llvmorg-${OMPVERSION}/openmp-${OMPVERSION}.src.tar.xz | tar xJvf -; \
+    mv cmake-${OMPVERSION}.src cmake; \
+    cd openmp-${OMPVERSION}.src; \
+    mkdir -p build-arm64 && cd build-arm64; \
+    cmake \
+        -GNinja \
+        -DLIBOMP_ENABLE_SHARED=OFF \
+        -DLIBOMP_INSTALL_ALIASES=OFF \
+        -DLIBOMP_ARCH=aarch64 \
+        -DCMAKE_TOOLCHAIN_FILE=/work/toolchain.cmake \
+        ..; \
+    cmake --build . -j$(nproc --all) -v;
+ADD . .
 
-#-DOpenMP_C_FLAGS="-fopenmp -I${LIBGCC} -L${LIBGCC}" -DOpenMP_C_LIB_NAMES=gomp -DOpenMP_CXX_FLAGS="-fopenmp -I${LIBGCC} -L${LIBGCC}" -DOpenMP_CXX_LIB_NAMES=gomp -DOpenMP_gomp_LIBRARY="${LIBGCC}/libgomp.a" \
 RUN mkdir -p /work/build && cd /work/build; \
     /usr/local/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=1 -DHAVE_ARM8=1 \
         -DCMAKE_TOOLCHAIN_FILE=/work/toolchain.cmake \
+        -DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AARCH64}" -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AARCH64}" -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=${LIBOMP_AARCH64}/libomp.a \
         -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DCMAKE_POLICY_DEFAULT_CMP0144=NEW \
         -DFORCE_STATIC_DEPS=1 -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES="75-real;80-real;86-real;89-real;90" ..; \
     cmake --build . -j$(nproc --all) -v;
