Skip to content

Commit 87a9e60

Browse files
author
Tyler Titsworth
authored
Merge branch 'main' into jafraust/test
2 parents 70fc3ea + caa06a4 commit 87a9e60

17 files changed

+233
-292
lines changed

‎jax/Dockerfile

+2-54
Original file line numberDiff line numberDiff line change
@@ -25,62 +25,10 @@ ARG BASE_IMAGE_NAME
2525
ARG BASE_IMAGE_TAG
2626
ARG PACKAGE_OPTION=pip
2727
ARG PYTHON_VERSION
28-
ARG PYTHON_BASE=${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER}-${BASE_IMAGE_NAME}-${BASE_IMAGE_TAG}-${PACKAGE_OPTION}-py${PYTHON_VERSION}-base
28+
ARG PYTHON_BASE=${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER}-${BASE_IMAGE_NAME}-${BASE_IMAGE_TAG}-${PACKAGE_OPTION}-py${PYTHON_VERSION}-xpu-base
2929
ARG TORCHSERVE_BASE=${PYTHON_BASE}
30-
FROM ${PYTHON_BASE} AS xpu-base
3130

32-
RUN apt-get update && \
33-
apt-get install -y --no-install-recommends --fix-missing \
34-
apt-utils \
35-
build-essential \
36-
clinfo \
37-
git \
38-
gnupg2 \
39-
gpg-agent \
40-
rsync \
41-
unzip && \
42-
apt-get clean && \
43-
rm -rf /var/lib/apt/lists/*
44-
45-
RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
46-
gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg
47-
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
48-
tee /etc/apt/sources.list.d/intel-gpu-jammy.list
49-
50-
ARG ICD_VER
51-
ARG LEVEL_ZERO_GPU_VER
52-
ARG LEVEL_ZERO_VER
53-
ARG LEVEL_ZERO_DEV_VER
54-
55-
RUN apt-get update && \
56-
apt-get install -y --no-install-recommends --fix-missing \
57-
intel-opencl-icd=${ICD_VER} \
58-
intel-level-zero-gpu=${LEVEL_ZERO_GPU_VER} \
59-
libze1=${LEVEL_ZERO_VER} \
60-
libze-dev=${LEVEL_ZERO_DEV_VER} && \
61-
rm -rf /var/lib/apt/lists/*
62-
63-
RUN no_proxy="" NO_PROXY="" wget --progress=dot:giga -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
64-
| gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
65-
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
66-
| tee /etc/apt/sources.list.d/oneAPI.list
67-
68-
ARG DPCPP_VER
69-
ARG MKL_VER
70-
ARG CCL_VER
71-
72-
RUN apt-get update && \
73-
apt-get install -y --no-install-recommends --fix-missing \
74-
intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
75-
intel-oneapi-runtime-mkl=${MKL_VER} \
76-
intel-oneapi-runtime-ccl=${CCL_VER} && \
77-
rm -rf /var/lib/apt/lists/*
78-
79-
RUN rm -rf /etc/apt/sources.list.d/intel-gpu-jammy.list /etc/apt/sources.list.d/oneAPI.list
80-
81-
ENV OCL_ICD_VENDORS=/etc/OpenCL/vendors
82-
83-
FROM xpu-base AS jax-base
31+
FROM ${PYTHON_BASE} AS jax-base
8432

8533
WORKDIR /
8634
COPY requirements.txt .

‎jax/docker-compose.yaml

+1-21
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,8 @@ services:
2424
no_proxy: ""
2525
BASE_IMAGE_NAME: ${BASE_IMAGE_NAME:-ubuntu}
2626
BASE_IMAGE_TAG: ${BASE_IMAGE_TAG:-22.04}
27-
CCL_VER: ${CCL_VER:-2021.13.1-31}
28-
DPCPP_VER: ${DPCPP_VER:-2024.2.1-1079}
2927
GITHUB_RUN_NUMBER: ${GITHUB_RUN_NUMBER:-0}
30-
ICD_VER: ${ICD_VER:-24.22.29735.27-914~22.04}
31-
LEVEL_ZERO_DEV_VER: ${LEVEL_ZERO_DEV_VER:-1.17.6-914~22.04}
32-
LEVEL_ZERO_GPU_VER: ${LEVEL_ZERO_GPU_VER:-1.3.29735.27-914~22.04}
33-
LEVEL_ZERO_VER: ${LEVEL_ZERO_VER:-1.17.6-914~22.04}
3428
MINIFORGE_VERSION: ${MINIFORGE_VERSION:-Linux-x86_64}
35-
MKL_VER: ${MKL_VER:-2024.2.1-103}
3629
NO_PROXY: ''
3730
PACKAGE_OPTION: ${PACKAGE_OPTION:-pip}
3831
PYTHON_VERSION: ${PYTHON_VERSION:-3.10}
@@ -41,20 +34,6 @@ services:
4134
context: .
4235
labels:
4336
dependency.python: ${PYTHON_VERSION:-3.10}
44-
dependency.apt.build-essential: true
45-
dependency.apt.clinfo: true
46-
dependency.apt.git: true
47-
dependency.apt.gnupg2: true
48-
dependency.apt.gpg-agent: true
49-
dependency.apt.intel-level-zero-gpu: ${LEVEL_ZERO_GPU_VER:-1.3.29735.27-914~22.04}
50-
dependency.apt.intel-oneapi-runtime-ccl: ${CCL_VER:-2021.13.1-31}
51-
dependency.apt.intel-oneapi-runtime-dpcpp-cpp: ${DPCPP_VER:-2024.2.1-1079}
52-
dependency.apt.intel-oneapi-runtime-mkl: ${MKL_VER:-2024.2.1-103}
53-
dependency.apt.intel-opencl-icd: ${ICD_VER:-23.43.27642.40-803~22.04}
54-
dependency.apt.level-zero: ${LEVEL_ZERO_VER:-1.17.6-914~22.04}
55-
dependency.apt.level-zero-dev: ${LEVEL_ZERO_DEV_VER:-1.17.6-914~22.04}
56-
dependency.apt.rsync: true
57-
dependency.apt.unzip: true
5837
dependency.idp.pip: false
5938
dependency.python.pip: requirements.txt
6039
docs: jax
@@ -67,6 +46,7 @@ services:
6746
bash -c "python -c 'import jax; print(\"Jax Version:\", jax.__version__)'"
6847
depends_on:
6948
- ${PACKAGE_OPTION:-pip}
49+
- xpu
7050
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-xla-${INTEL_XLA_VERSION:-v0.4.0}-base
7151
pull_policy: always
7252
jupyter:

‎preset/classical-ml/Dockerfile

+15-24
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,12 @@ RUN wget --progress=dot:giga --no-check-certificate https://github.com/conda-for
5959
export PATH="${CONDA_ROOT}/bin/:${PATH}" && \
6060
conda init --all && \
6161
conda install -y \
62-
'colorama==0.4.6' \
63-
'conda==24.5.0' \
64-
'jupyterhub==5.1.0' \
65-
'jupyter-server-proxy==4.3.0' \
66-
'mamba==1.5.8' \
67-
'networkx==3.3' \
68-
'notebook==7.2.1' \
69-
'pip==24.0' \
70-
'python==3.10.14' \
71-
'idna>=3.7' \
72-
'requests>=2.32.0' \
73-
'setuptools>=70.0.0' \
74-
'tqdm>=4.66.3' \
75-
'urllib3>=2.2.2' \
76-
'nodejs==22.5.1' \
62+
'conda==24.9.2' \
63+
'jupyterlab==4.2.5' \
64+
'jupyterhub==5.2.1' \
65+
'notebook==7.2.2' \
66+
'jupyter-server-proxy==4.4.0' \
67+
'nb_conda_kernels==2.5.1' \
7768
&& \
7869
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" \
7970
&& \
@@ -98,22 +89,22 @@ RUN conda create -yn classical-ml \
9889
"dpnp=${DPNP_VERSION}" \
9990
'ipykernel==6.29.5' \
10091
'kernda==0.3.0' \
101-
'matplotlib-base==3.8.4' \
92+
'matplotlib-base==3.9.2' \
10293
"modin-ray=${MODIN_VERSION}" \
10394
'python-dotenv==1.0.1' \
10495
"scikit-learn-intelex=${SKLEARNEX_VERSION}" \
105-
'tqdm==4.66.4' \
96+
'tqdm==4.66.5' \
10697
"xgboost=${XGBOOST_VERSION}" \
107-
'idna>=3.7' \
108-
'requests>=2.32.0' \
109-
'setuptools>=70.0.0' \
110-
'tqdm>=4.66.3' \
111-
'urllib3>=2.2.2' \
98+
"setuptools>=70.0.0" \
11299
&& \
113100
conda clean -y --all
114101

115-
RUN conda run -n classical-ml python -m pip install --no-deps --no-cache-dir \
116-
'dataset-librarian==1.0.4'
102+
# PyPI packages
103+
COPY requirements.txt .
104+
RUN conda run -n 'classical-ml' python -m pip install --no-deps --no-cache-dir -r requirements.txt && \
105+
conda clean -y --all
106+
107+
RUN rm -rf requirements.txt
117108

118109
ENV PYTHONSTARTUP=~/.patch_sklearn.py
119110
COPY base/.patch_sklearn.py ~/.patch_sklearn.py

‎preset/classical-ml/docker-compose.yaml

+7-10
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,21 @@ services:
6060
dependency.apt.unzip: true
6161
dependency.apt.wget: true
6262
dependency.apt.xz-utils: true
63-
dependency.conda.colorama: '==0.4.6'
64-
dependency.conda.conda: '==24.5.0'
63+
dependency.conda.conda: '==24.9.2'
6564
dependency.conda.daal4py: '=2024.5.0'
6665
dependency.conda.dpnp: '=0.15.0'
6766
dependency.conda.ipykernel: '==6.29.5'
68-
dependency.conda.jupyterhub: '==5.1.0'
69-
dependency.conda.jupyter-server-proxy: '==4.3.0'
67+
dependency.conda.jupyterhub: '==5.2.1'
68+
dependency.conda.jupyter-server-proxy: '==4.4.0'
7069
dependency.conda.kernda: '==0.3.0'
71-
dependency.conda.mamba: '==1.5.8'
72-
dependency.conda.matplotlib-base: '==3.8.4'
70+
dependency.conda.matplotlib-base: '==3.9/2'
7371
dependency.conda.modin-ray: '=0.30.0'
74-
dependency.conda.networkx: '==3.3'
75-
dependency.conda.notebook: '==7.2.1'
76-
dependency.conda.pip: '==24.0'
72+
dependency.conda.nb_conda_kernels: '==2.5.1'
73+
dependency.conda.notebook: '==7.2.2'
7774
dependency.conda.python: '==3.10.14'
7875
dependency.conda.python-dotenv: '==1.0.1'
7976
dependency.conda.scikit-learn-intelex: '=2024.5.0'
80-
dependency.conda.tqdm: '==4.66.4'
77+
dependency.conda.tqdm: '==4.66.5'
8178
dependency.conda.xgboost: '=2.0.3'
8279
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
8380
environment:

‎preset/data-analytics/Dockerfile

+13-21
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,12 @@ RUN wget --progress=dot:giga --no-check-certificate "https://github.com/conda-fo
5959
export PATH="${CONDA_ROOT}/bin/:${PATH}" && \
6060
conda init --all && \
6161
conda install -y \
62-
'colorama==0.4.6' \
63-
'conda==24.5.0' \
64-
'jupyterhub==5.1.0' \
65-
'jupyter-server-proxy==4.3.0' \
66-
'mamba==1.5.8' \
67-
'networkx==3.3' \
68-
'notebook==7.2.1' \
69-
'python==3.10.14' \
70-
'idna>=3.7' \
71-
'requests>=2.32.0' \
72-
'setuptools>=70.0.0' \
73-
'tqdm>=4.66.3' \
74-
'urllib3>=2.2.2' \
75-
'nodejs==22.5.1' \
62+
'conda==24.9.2' \
63+
'jupyterlab==4.2.5' \
64+
'jupyterhub==5.2.1' \
65+
'notebook==7.2.2' \
66+
'jupyter-server-proxy==4.4.0' \
67+
'nb_conda_kernels==2.5.1' \
7668
&& \
7769
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" \
7870
&& \
@@ -93,19 +85,19 @@ RUN conda create -yn data-analytics \
9385
"dpnp=${DPNP_VERSION}" \
9486
'ipykernel==6.29.5' \
9587
'kernda==0.3.0' \
96-
'matplotlib-base==3.8.4' \
88+
'matplotlib-base==3.9.2' \
9789
"modin-ray=${MODIN_VERSION}" \
9890
'python-dotenv==1.0.1' \
99-
'idna>=3.7' \
100-
'requests>=2.32.0' \
10191
'setuptools>=70.0.0' \
102-
'tqdm>=4.66.3' \
103-
'urllib3>=2.2.2' \
92+
'tqdm==4.66.5' \
10493
&& \
10594
conda clean -y --all
10695

107-
RUN conda run -n data-analytics python -m pip install --no-deps --no-cache-dir \
108-
'dataset-librarian==1.0.4'
96+
COPY requirements.txt .
97+
RUN conda run -n 'data-analytics' python -m pip install --no-deps --no-cache-dir -r requirements.txt && \
98+
conda clean -y --all
99+
100+
RUN rm -rf requirements.txt
109101

110102
EXPOSE 8888
111103

‎preset/data-analytics/docker-compose.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,19 @@ services:
5656
dependency.apt.unzip: true
5757
dependency.apt.wget: true
5858
dependency.apt.xz-utils: true
59-
dependency.conda.colorama: '==0.4.6'
60-
dependency.conda.conda: '==24.5.0'
59+
dependency.conda.conda: '==24.9.2'
6160
dependency.conda.dpnp: '=0.15.0'
6261
dependency.conda.ipykernel: '==6.29.5'
63-
dependency.conda.jupyterhub: '==5.1.0'
62+
dependency.conda.jupyterhub: '==5.2.1'
6463
dependency.conda.jupyter-server-proxy: '==4.3.0'
6564
dependency.conda.kernda: '==0.3.0'
66-
dependency.conda.mamba: '==1.5.8'
6765
dependency.conda.matplotlib-base: '==3.8.4'
6866
dependency.conda.modin-ray: '=0.30.0'
69-
dependency.conda.networkx: '==3.3'
70-
dependency.conda.notebook: '==7.2.1'
67+
dependency.conda.nb_conda_kernels: '==2.5.1'
68+
dependency.conda.notebook: '==7.2.2'
7169
dependency.conda.python: '==3.10.14'
7270
dependency.conda.python-dotenv: '==1.0.1'
71+
dependency.conda.tqdm: '==4.66.5'
7372
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
7473
environment:
7574
http_proxy: ${http_proxy}

‎python/.actions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"IDP_VERSION": ["full", "core"],
33
"experimental": [true],
4-
"runner_label": ["clx"]
4+
"runner_label": ["PVC"]
55
}

‎python/Dockerfile

+57
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
ARG BASE_IMAGE_NAME=ubuntu
3030
ARG BASE_IMAGE_TAG=22.04
31+
ARG PACKAGE_OPTION=pip
3132

3233
FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} AS base
3334

@@ -103,3 +104,59 @@ WORKDIR /
103104
COPY requirements.txt .
104105

105106
RUN python -m pip --no-cache-dir install -r requirements.txt
107+
108+
FROM ${PACKAGE_OPTION} as xpu-base
109+
110+
RUN apt-get update && \
111+
apt-get install -y --no-install-recommends --fix-missing \
112+
apt-utils \
113+
build-essential \
114+
clinfo \
115+
git \
116+
gnupg2 \
117+
gpg-agent \
118+
rsync \
119+
unzip && \
120+
apt-get clean && \
121+
rm -rf /var/lib/apt/lists/*
122+
123+
RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
124+
gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg
125+
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
126+
tee /etc/apt/sources.list.d/intel-gpu-jammy.list
127+
128+
ARG ICD_VER
129+
ARG LEVEL_ZERO_GPU_VER
130+
ARG LEVEL_ZERO_VER
131+
ARG LEVEL_ZERO_DEV_VER
132+
133+
RUN apt-get update && \
134+
apt-get install -y --no-install-recommends --fix-missing \
135+
intel-opencl-icd=${ICD_VER} \
136+
intel-level-zero-gpu=${LEVEL_ZERO_GPU_VER} \
137+
libze1=${LEVEL_ZERO_VER} \
138+
libze-dev=${LEVEL_ZERO_DEV_VER} && \
139+
apt-get clean && \
140+
rm -rf /var/lib/apt/lists/*
141+
142+
RUN no_proxy="" NO_PROXY="" wget --progress=dot:giga -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
143+
| gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
144+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
145+
| tee /etc/apt/sources.list.d/oneAPI.list
146+
147+
ARG DPCPP_VER
148+
ARG MKL_VER
149+
ARG CCL_VER
150+
151+
RUN apt-get update && \
152+
apt-get install -y --no-install-recommends --fix-missing \
153+
intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
154+
intel-oneapi-runtime-mkl=${MKL_VER} \
155+
intel-oneapi-runtime-ccl=${CCL_VER} && \
156+
rm -rf /var/lib/apt/lists/*
157+
158+
RUN rm -rf /etc/apt/sources.list.d/intel-gpu-jammy.list /etc/apt/sources.list.d/oneAPI.list
159+
160+
RUN if eval "which conda >/dev/null"; then \
161+
echo 'export OCL_ICD_VENDORS="/etc/OpenCL/vendors"' >> ~/.bashrc; \
162+
fi

0 commit comments

Comments
 (0)