diff --git a/lhc/simpletrack/.simpletrack-ci.yml b/lhc/simpletrack/.simpletrack-ci.yml index eb619d7569ef696ed4810ba495d06fb9925d309e..eb43ed8d088c29d199b7db80efb91a20b57c7c4c 100644 --- a/lhc/simpletrack/.simpletrack-ci.yml +++ b/lhc/simpletrack/.simpletrack-ci.yml @@ -78,7 +78,7 @@ test:intel: - job: build:intel artifacts: false -test:pocl: +.test:pocl: <<: *job_test image: name: gitlab-registry.cern.ch/hep-benchmarks/hep-workloads-gpu/simpletrack/pocl:ci-qa-latest @@ -100,7 +100,7 @@ bench:intel: - job: test:intel artifacts: false -bench:pocl: +.bench:pocl: <<: *job_bench image: name: gitlab-registry.cern.ch/hep-benchmarks/hep-workloads-gpu/simpletrack/pocl:ci-qa-latest diff --git a/lhc/simpletrack/Dockerfile.intel b/lhc/simpletrack/Dockerfile.intel index 66bf2e0ed20fa2e89ff169d73c45aaff8119f3a9..a079d361a23af212d767c36315cd8fc09c447068 100644 --- a/lhc/simpletrack/Dockerfile.intel +++ b/lhc/simpletrack/Dockerfile.intel @@ -9,7 +9,7 @@ ENV SRC_URL "https://github.com/intel/compute-runtime/releases/download" ENV NEO_DIR "/opt/intel/neo" ENV NEO_VER "20.25.17111" -RUN apt-get update && apt upgrade -y && apt-get -y install python3-pip ocl-icd-opencl-dev clinfo wget git \ +RUN apt-get update && apt upgrade -y && apt-get -y install python3-pip ocl-icd-opencl-dev clinfo wget git time \ && mkdir -p ${OCL_DIR} ${TBB_DIR} /etc/OpenCL/vendors && cd ${OCL_DIR} \ && wget https://github.com/intel/llvm/releases/download/2020-06/oclcpuexp-${OCL_VER}_rel.tar.gz \ && tar zxvf oclcpuexp-*.tar.gz && rm oclcpuexp-*.tar.gz \ diff --git a/lhc/simpletrack/Dockerfile.nvidia b/lhc/simpletrack/Dockerfile.nvidia index 75dffced70a7f97d932afe17f97ff0ff5090ed40..c7e4536c8b85afedb66794e834c084e0a5618451 100644 --- a/lhc/simpletrack/Dockerfile.nvidia +++ b/lhc/simpletrack/Dockerfile.nvidia @@ -5,7 +5,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES compute,utility RUN distribution=$(. /etc/os-release;echo $ID$VERSION_ID) \ && curl -s -L https://nvidia.github.io/nvidia-container-runtime/$distribution/nvidia-container-runtime.repo | tee /etc/yum.repos.d/nvidia-container-runtime.repo \ - && yum install -y epel-release && yum install -y ocl-icd clinfo nvidia-container-runtime \ + && yum install -y epel-release && yum install -y ocl-icd clinfo nvidia-container-runtime time \ && mkdir -p /etc/OpenCL/vendors && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd RUN yum install -y python3 python3-devel python3-pip git gcc gcc-c++ ocl-icd-devel && pip3 install pybind11 mako pyopencl \ diff --git a/lhc/simpletrack/Dockerfile.pocl b/lhc/simpletrack/Dockerfile.pocl index 26c11301cafb057241adeb1b1df0a47d3c7dd258..42a9ca08bba8e79b69b7eeb6ac07a3f135ac0af8 100644 --- a/lhc/simpletrack/Dockerfile.pocl +++ b/lhc/simpletrack/Dockerfile.pocl @@ -5,7 +5,7 @@ ENV OCL_ICD_VENDORS "/pocl/build/ocl-vendors" ENV POCL_BUILDING "1" RUN apt update && apt upgrade -y \ - && apt-get install -y build-essential ocl-icd-libopencl1 cmake git gcc g++ libhwloc5 pkg-config python3-pip libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev make ninja-build ocl-icd-libopencl1 ocl-icd-dev ocl-icd-opencl-dev libhwloc-dev zlib1g zlib1g-dev clinfo + && apt-get install -y build-essential ocl-icd-libopencl1 cmake git gcc g++ libhwloc5 pkg-config python3-pip libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev make ninja-build ocl-icd-libopencl1 ocl-icd-dev ocl-icd-opencl-dev libhwloc-dev zlib1g zlib1g-dev clinfo time RUN git clone https://github.com/pocl/pocl.git \ && cd pocl && mkdir build && cd build && cmake -G Ninja .. \ diff --git a/lhc/simpletrack/Dockerfile.rocm b/lhc/simpletrack/Dockerfile.rocm index c293b7fa4eacec9efeaf302d0b69a0467447c968..e2cb89c44d089f443d8225fc191a898658a187c3 100644 --- a/lhc/simpletrack/Dockerfile.rocm +++ b/lhc/simpletrack/Dockerfile.rocm @@ -1,6 +1,6 @@ FROM debian:latest -RUN apt -y update && apt -y dist-upgrade && apt install -y libnuma-dev ocl-icd-opencl-dev clinfo python3-pip gnupg wget git \ +RUN apt -y update && apt -y dist-upgrade && apt install -y libnuma-dev ocl-icd-opencl-dev clinfo python3-pip gnupg wget git time \ && wget -q -O - http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add - \ && echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main' | tee /etc/apt/sources.list.d/rocm.list \ && apt update && apt install -y rocm-dkms \