Merge branch 'revert_clang13' into 'latest'

Revert clang13 and fix bug

See merge request ricos/allgebra!73

Author: Toshiaki Hishinuma

.gitlab-ci.yml

@@ -10,13 +10,13 @@ stages:
   - test
   - deploy
 
-build-cuda11_7-clang14:
+build-cuda11_7-clang13:
   extends: .dind
   stage: build
   script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - make push/cuda11_7/clang14/mkl
-    - make push/cuda11_7/clang14/oss
+    - make push/cuda11_7/clang13/mkl
+    - make push/cuda11_7/clang13/oss
   timeout: 3 hours
   tags:
     - docker
@@ -46,9 +46,9 @@ release:
     - latest
     - tags
 
-cuda11_7-clang14-mkl-test:
+cuda11_7-clang13-mkl-test:
   stage: test
-  image: ${CI_REGISTRY_IMAGE}/cuda11_7-clang14-mkl:${CI_COMMIT_REF_NAME}
+  image: ${CI_REGISTRY_IMAGE}/cuda11_7-clang13-mkl:${CI_COMMIT_REF_NAME}
   before_script:
     - nvidia-smi
   script:
@@ -57,9 +57,9 @@ cuda11_7-clang14-mkl-test:
   tags:
     - sm_61
 
-cuda11_7-clang14-oss-test:
+cuda11_7-clang13-oss-test:
   stage: test
-  image: ${CI_REGISTRY_IMAGE}/cuda11_7-clang14-oss:${CI_COMMIT_REF_NAME}
+  image: ${CI_REGISTRY_IMAGE}/cuda11_7-clang13-oss:${CI_COMMIT_REF_NAME}
   before_script:
     - nvidia-smi
   script:

CHANGELOG.md

@@ -12,6 +12,7 @@ Unreleased
 
 Changed
 ------
+- Revert clang 14.0.4 -> 13.0.1, and fix makefile bug <https://gitlab.ritc.jp/ricos/allgebra/-/merge_requests/73>
 - Update clang 13.0.1 -> 14.0.4 <https://gitlab.ritc.jp/ricos/allgebra/-/merge_requests/72>
 
 22.05.3 - 2022/05/25

Makefile

@@ -2,7 +2,7 @@ HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 ALLGEBRA_TOPDIR := $(shell git rev-parse --show-toplevel)
 
 TARGET_CUDA=cuda11_7
-TARGET_CLANG=clang14
+TARGET_CLANG=clang13
 TARGET_GCC=gcc11
 
 REQUIREMENT_TARGETS := $(TARGET_CUDA) $(TARGET_CUDA)/$(TARGET_GCC) $(TARGET_CUDA)/$(TARGET_CLANG)

README.md

@@ -23,13 +23,13 @@ Named in `allgebra/{GPU}/{Compiler}/{Math}` format:
 
 | Image name                                                            | CUDA | Compiler            | Math      |
 |:----------------------------------------------------------------------|:----:|:-------------------:|:---------:|
-| [ghcr.io/ricosjp/allgebra/cuda11_7/clang14/mkl][cuda11_7/clang14/mkl] | 11.7 | clang 14, gcc 11, nvcc 11.7 | Intel MKL |
-| [ghcr.io/ricosjp/allgebra/cuda11_7/clang14/oss][cuda11_7/clang14/oss] | 11.7 | clang 14, gcc 11, nvcc 11.7 | OpenBLAS  |
+| [ghcr.io/ricosjp/allgebra/cuda11_7/clang13/mkl][cuda11_7/clang13/mkl] | 11.7 | clang 13, gcc 11, nvcc 11.7 | Intel MKL |
+| [ghcr.io/ricosjp/allgebra/cuda11_7/clang13/oss][cuda11_7/clang13/oss] | 11.7 | clang 13, gcc 11, nvcc 11.7 | OpenBLAS  |
 | [ghcr.io/ricosjp/allgebra/cuda11_7/gcc11/mkl][cuda11_7/gcc11/mkl]     | 11.7 | gcc 11, nvcc 11.7 | Intel MKL |
 | [ghcr.io/ricosjp/allgebra/cuda11_7/gcc11/oss][cuda11_7/gcc11/oss]     | 11.7 | gcc 11, nvcc 11.7 | OpenBLAS  |
 
-[cuda11_7/clang14/mkl]: https://github.com/ricosjp/allgebra/pkgs/container/allgebra%2Fcuda11_7%2Fclang14%2Fmkl
-[cuda11_7/clang14/oss]: https://github.com/ricosjp/allgebra/pkgs/container/allgebra%2Fcuda11_7%2Fclang14%2Foss
+[cuda11_7/clang13/mkl]: https://github.com/ricosjp/allgebra/pkgs/container/allgebra%2Fcuda11_7%2Fclang13%2Fmkl
+[cuda11_7/clang13/oss]: https://github.com/ricosjp/allgebra/pkgs/container/allgebra%2Fcuda11_7%2Fclang13%2Foss
 [cuda11_7/gcc11/mkl]: https://github.com/orgs/ricosjp/packages/container/package/allgebra%2Fcuda11_7%2Fgcc11%2Fmkl
 [cuda11_7/gcc11/oss]: https://github.com/orgs/ricosjp/packages/container/package/allgebra%2Fcuda11_7%2Fgcc11%2Foss
 

allgebra_template/gen_allgebra.sh

@@ -6,9 +6,9 @@ CUDA_MAJOR=11
 CUDA_MINOR=7
 CUDA_PATCH=0
 
-LLVM_MAJOR=14
+LLVM_MAJOR=13
 LLVM_MINOR=0
-LLVM_PATCH=4
+LLVM_PATCH=1
 
 GCC_MAJOR=11
 GCC_MINOR=2

cuda11_7/clang14/Dockerfile cuda11_7/clang13/Dockerfilecuda11_7/clang14/Dockerfile renamed to cuda11_7/clang13/Dockerfile

@@ -9,19 +9,19 @@ ARG REGISTRY
 ARG TAG
 
 #
-# Intermediate container for building LLVM 14
+# Intermediate container for building LLVM 13
 #
 FROM ${REGISTRY}/cuda11_7:${TAG} AS build
 
-RUN curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/llvm-project-14.0.4.src.tar.xz \
-   && tar xf llvm-project-14.0.4.src.tar.xz \
-   && rm llvm-project-14.0.4.src.tar.xz
+RUN curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/llvm-project-13.0.1.src.tar.xz \
+   && tar xf llvm-project-13.0.1.src.tar.xz \
+   && rm llvm-project-13.0.1.src.tar.xz
 
-# Install LLVM 14.0.4 into /usr/local/llvm-14.0.4
-RUN cd llvm-project-14.0.4.src \
+# Install LLVM 13.0.1 into /usr/local/llvm-13.0.1
+RUN cd llvm-project-13.0.1.src \
    && cmake -Wno-dev -Bbuild -G Ninja \
    -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-14.0.4/ \
+   -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-13.0.1/ \
    -DLLVM_TARGETS_TO_BUILD="X86;NVPTX" \
    -DLLVM_ENABLE_PROJECTS=clang \
    llvm \
@@ -40,23 +40,23 @@ RUN cd /usr/include \
    && ln -s x86_64-linux-gnu/gnu
 
 # Build libomptarget
-RUN cd llvm-project-14.0.4.src \
+RUN cd llvm-project-13.0.1.src \
    && cmake -Wno-dev -Bbuild_omp -G Ninja \
    -DCMAKE_BUILD_TYPE=Debug \
-   -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-14.0.4/ \
-   -DCMAKE_C_COMPILER=/usr/local/llvm-14.0.4/bin/clang \
-   -DCMAKE_CXX_COMPILER=/usr/local/llvm-14.0.4/bin/clang++ \
+   -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-13.0.1/ \
+   -DCMAKE_C_COMPILER=/usr/local/llvm-13.0.1/bin/clang \
+   -DCMAKE_CXX_COMPILER=/usr/local/llvm-13.0.1/bin/clang++ \
    -DLIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES=all \
    openmp \
    && cmake --build build_omp --target install \
-   && rm -rf /llvm-project-14.0.4.src
+   && rm -rf /llvm-project-13.0.1.src
 
-# LLVM 14.0.4 environements
-RUN echo "/usr/local/llvm-14.0.4/lib" > /etc/ld.so.conf.d/llvm-14.0.4.conf \
+# LLVM 13.0.1 environements
+RUN echo "/usr/local/llvm-13.0.1/lib" > /etc/ld.so.conf.d/llvm-13.0.1.conf \
    && ldconfig
-ENV PATH /usr/local/llvm-14.0.4/bin:$PATH
-ENV CC   /usr/local/llvm-14.0.4/bin/clang
-ENV CXX  /usr/local/llvm-14.0.4/bin/clang++
+ENV PATH /usr/local/llvm-13.0.1/bin:$PATH
+ENV CC   /usr/local/llvm-13.0.1/bin/clang
+ENV CXX  /usr/local/llvm-13.0.1/bin/clang++
 
 #
 # Build and install OpenMPI
@@ -78,28 +78,28 @@ RUN ./autogen.pl \
    && make install -j $(nproc)
 
 #
-# CUDA 11.6 with LLVM 14
+# CUDA 11.6 with LLVM 13
 #
 FROM ${REGISTRY}/cuda11_7:${TAG} AS release
 
-# LLVM 14.0.4 environements
-COPY --from=build /usr/local/llvm-14.0.4 /usr/local/llvm-14.0.4
-RUN echo "/usr/local/llvm-14.0.4/lib" > /etc/ld.so.conf.d/llvm-14.0.4.conf \
+# LLVM 13.0.1 environements
+COPY --from=build /usr/local/llvm-13.0.1 /usr/local/llvm-13.0.1
+RUN echo "/usr/local/llvm-13.0.1/lib" > /etc/ld.so.conf.d/llvm-13.0.1.conf \
    && ldconfig
-ENV PATH /usr/local/llvm-14.0.4/bin:$PATH
-ENV CC   /usr/local/llvm-14.0.4/bin/clang
-ENV CXX  /usr/local/llvm-14.0.4/bin/clang++
+ENV PATH /usr/local/llvm-13.0.1/bin:$PATH
+ENV CC   /usr/local/llvm-13.0.1/bin/clang
+ENV CXX  /usr/local/llvm-13.0.1/bin/clang++
 
-ENV ALLGEBRA_LLVM_INSTALL_DIR /usr/local/llvm-14.0.4
-ENV ALLGEBRA_LLVM_VERSION 14.0.4
-ENV ALLGEBRA_LLVM_VERSION_MAJOR 14
+ENV ALLGEBRA_LLVM_INSTALL_DIR /usr/local/llvm-13.0.1
+ENV ALLGEBRA_LLVM_VERSION 13.0.1
+ENV ALLGEBRA_LLVM_VERSION_MAJOR 13
 ENV ALLGEBRA_LLVM_VERSION_MINOR 0
-ENV ALLGEBRA_LLVM_VERSION_PATCH 4
+ENV ALLGEBRA_LLVM_VERSION_PATCH 1
 
 # Skip CPATH because this path should be treated as system directory
 # See GCC manual for detail https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
-ENV C_INCLUDE_PATH     /usr/local/llvm-14.0.4/include:$C_INCLUDE_PATH
-ENV CPLUS_INCLUDE_PATH /usr/local/llvm-14.0.4/include:$CPLUS_INCLUDE_PATH
+ENV C_INCLUDE_PATH     /usr/local/llvm-13.0.1/include:$C_INCLUDE_PATH
+ENV CPLUS_INCLUDE_PATH /usr/local/llvm-13.0.1/include:$CPLUS_INCLUDE_PATH
 
 # OpenMPI environements
 COPY --from=build /usr/local/ompi-4.1.3 /usr/local/ompi-4.1.3

cuda11_7/clang14/Makefile cuda11_7/clang13/Makefilecuda11_7/clang14/Makefile renamed to cuda11_7/clang13/Makefile

@@ -1,6 +1,6 @@
 HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 ALLGEBRA_TOPDIR := $(shell git rev-parse --show-toplevel)
 
-TARGET := cuda11_7/clang14
+TARGET := cuda11_7/clang13
 
 include $(ALLGEBRA_TOPDIR)/common.mk

cuda11_7/clang14/mkl/Dockerfile cuda11_7/clang13/mkl/Dockerfilecuda11_7/clang14/mkl/Dockerfile renamed to cuda11_7/clang13/mkl/Dockerfile

@@ -8,7 +8,7 @@
 ARG REGISTRY
 ARG TAG
 
-FROM ${REGISTRY}/cuda11_7-clang14:${TAG}
+FROM ${REGISTRY}/cuda11_7-clang13:${TAG}
 
 # Intel MKL
 RUN apt-get update && apt-get install -y \

cuda11_7/clang14/oss/Makefile cuda11_7/clang13/mkl/Makefilecuda11_7/clang14/oss/Makefile renamed to cuda11_7/clang13/mkl/Makefile

@@ -1,6 +1,6 @@
 HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 ALLGEBRA_TOPDIR := $(shell git rev-parse --show-toplevel)
 
-TARGET := cuda11_7/clang14/oss
+TARGET := cuda11_7/clang13/mkl
 
 include $(ALLGEBRA_TOPDIR)/common.mk

cuda11_7/clang14/oss/Dockerfile cuda11_7/clang13/oss/Dockerfilecuda11_7/clang14/oss/Dockerfile renamed to cuda11_7/clang13/oss/Dockerfile

@@ -8,7 +8,7 @@
 ARG REGISTRY
 ARG TAG
 
-FROM ${REGISTRY}/cuda11_7-clang14:${TAG}
+FROM ${REGISTRY}/cuda11_7-clang13:${TAG}
 
 # OSS OpenBLAS
 RUN apt-get update && apt-get install -y \