Skip to content

Commit ea16419

Browse files
author
Tyler Titsworth
authored
Merge branch 'main' into tylertitsworth/tf-serving-chart
2 parents 3019ebb + d1cc89f commit ea16419

File tree

9 files changed

+245
-15
lines changed

9 files changed

+245
-15
lines changed

.github/release/v0.4.0.json

+230
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
[
2+
{
3+
"base": "ubuntu:22.04",
4+
"dockerfile": "python/Dockerfile",
5+
"repo": "intel/python",
6+
"tag": "3.10-core"
7+
},
8+
{
9+
"base": "ubuntu:22.04",
10+
"dockerfile": "python/Dockerfile",
11+
"repo": "intel/python",
12+
"tag": "3.10-full"
13+
},
14+
{
15+
"base": "ubuntu:22.04",
16+
"dockerfile": "classical-ml/Dockerfile",
17+
"repo": "intel/intel-optimized-ml",
18+
"tag": "2024.6.0-pip-base"
19+
},
20+
{
21+
"base": "intel/intel-optimized-ml:2024.6.0-pip-base",
22+
"dockerfile": "classical-ml/Dockerfile",
23+
"repo": "intel/intel-optimized-ml",
24+
"tag": "2024.6.0-pip-jupyter"
25+
},
26+
{
27+
"base": "intel/python:3.10-core",
28+
"dockerfile": "classical-ml/Dockerfile",
29+
"repo": "intel/intel-optimized-ml",
30+
"tag": "2024.6.0-idp-base"
31+
},
32+
{
33+
"base": "intel/intel-optimized-ml:2024.6.0-idp-base",
34+
"dockerfile": "classical-ml/Dockerfile",
35+
"repo": "intel/intel-optimized-ml",
36+
"tag": "2024.6.0-idp-jupyter"
37+
},
38+
{
39+
"base": "ubuntu:22.04",
40+
"dockerfile": "tensorflow/Dockerfile",
41+
"repo": "intel/intel-optimized-tensorflow",
42+
"tag": "2.15.0.1-xpu-pip-base"
43+
},
44+
{
45+
"base": "intel/intel-optimized-tensorflow:2.15.0.1-xpu-pip-base",
46+
"dockerfile": "tensorflow/Dockerfile",
47+
"repo": "intel/intel-optimized-tensorflow",
48+
"tag": "2.15.0.1-xpu-pip-jupyter"
49+
},
50+
{
51+
"base": "intel/python:3.10-core",
52+
"dockerfile": "tensorflow/Dockerfile",
53+
"repo": "intel/intel-optimized-tensorflow",
54+
"tag": "2.15.0.1-xpu-idp-base"
55+
},
56+
{
57+
"base": "intel/intel-optimized-tensorflow:2.15.0.1-xpu-idp-base",
58+
"dockerfile": "tensorflow/Dockerfile",
59+
"repo": "intel/intel-optimized-tensorflow",
60+
"tag": "2.15.0.1-xpu-idp-jupyter"
61+
},
62+
{
63+
"base": "ubuntu:22.04",
64+
"dockerfile": "tensorflow/Dockerfile",
65+
"repo": "intel/intel-optimized-tensorflow",
66+
"tag": "2.15.1-pip-base"
67+
},
68+
{
69+
"base": "intel/intel-optimized-tensorflow:2.15.1-pip-base",
70+
"dockerfile": "tensorflow/Dockerfile",
71+
"repo": "intel/intel-optimized-tensorflow",
72+
"tag": "2.15.1-pip-jupyter"
73+
},
74+
{
75+
"base": "intel/intel-optimized-tensorflow:2.15.1-pip-base",
76+
"dockerfile": "tensorflow/Dockerfile",
77+
"repo": "intel/intel-optimized-tensorflow",
78+
"tag": "2.15.1-pip-multinode"
79+
},
80+
{
81+
"base": "intel/python:3.10-core",
82+
"dockerfile": "tensorflow/Dockerfile",
83+
"repo": "intel/intel-optimized-tensorflow",
84+
"tag": "2.15.0-idp-base"
85+
},
86+
{
87+
"base": "intel/intel-optimized-tensorflow:2.15.0-idp-base",
88+
"dockerfile": "tensorflow/Dockerfile",
89+
"repo": "intel/intel-optimized-tensorflow",
90+
"tag": "2.15.0-idp-jupyter"
91+
},
92+
{
93+
"base": "intel/intel-optimized-tensorflow:2.15.0-idp-base",
94+
"dockerfile": "tensorflow/Dockerfile",
95+
"repo": "intel/intel-optimized-tensorflow",
96+
"tag": "2.15.0-idp-multinode"
97+
},
98+
{
99+
"base": "ubuntu:22.04",
100+
"dockerfile": "pytorch/Dockerfile",
101+
"repo": "intel/intel-optimized-pytorch",
102+
"tag": "2.1.40-xpu-pip-base"
103+
},
104+
{
105+
"base": "intel/intel-optimized-pytorch:2.1.40-xpu-pip-base",
106+
"dockerfile": "pytorch/Dockerfile",
107+
"repo": "intel/intel-optimized-pytorch",
108+
"tag": "2.1.40-xpu-pip-jupyter"
109+
},
110+
{
111+
"base": "intel/python:3.10-core",
112+
"dockerfile": "pytorch/Dockerfile",
113+
"repo": "intel/intel-optimized-pytorch",
114+
"tag": "2.1.40-xpu-idp-base"
115+
},
116+
{
117+
"base": "intel/intel-optimized-pytorch:2.1.40-xpu-idp-base",
118+
"dockerfile": "pytorch/Dockerfile",
119+
"repo": "intel/intel-optimized-pytorch",
120+
"tag": "2.1.40-xpu-idp-jupyter"
121+
},
122+
{
123+
"base": "ubuntu:22.04",
124+
"dockerfile": "pytorch/Dockerfile",
125+
"repo": "intel/intel-optimized-pytorch",
126+
"tag": "2.4.0-pip-base"
127+
},
128+
{
129+
"base": "intel/intel-optimized-pytorch:2.4.0-pip-base",
130+
"dockerfile": "pytorch/Dockerfile",
131+
"repo": "intel/intel-optimized-pytorch",
132+
"tag": "2.4.0-pip-jupyter"
133+
},
134+
{
135+
"base": "intel/intel-optimized-pytorch:2.4.0-pip-base",
136+
"dockerfile": "pytorch/Dockerfile",
137+
"repo": "intel/intel-optimized-pytorch",
138+
"tag": "2.4.0-pip-multinode"
139+
},
140+
{
141+
"base": "intel/intel-optimized-pytorch:2.4.0-pip-multinode",
142+
"dockerfile": "pytorch/Dockerfile",
143+
"repo": "intel/intel-optimized-pytorch",
144+
"tag": "2.4.0-pip-hf-4.44.0-genai"
145+
},
146+
{
147+
"base": "intel/python:3.10-core",
148+
"dockerfile": "pytorch/Dockerfile",
149+
"repo": "intel/intel-optimized-pytorch",
150+
"tag": "2.4.0-idp-base"
151+
},
152+
{
153+
"base": "intel/intel-optimized-pytorch:2.4.0-idp-base",
154+
"dockerfile": "pytorch/Dockerfile",
155+
"repo": "intel/intel-optimized-pytorch",
156+
"tag": "2.4.0-idp-jupyter"
157+
},
158+
{
159+
"base": "intel/intel-optimized-pytorch:2.4.0-idp-base",
160+
"dockerfile": "pytorch/Dockerfile",
161+
"repo": "intel/intel-optimized-pytorch",
162+
"tag": "2.4.0-idp-multinode"
163+
},
164+
{
165+
"base": "intel/intel-optimized-pytorch:2.4.0-idp-multinode",
166+
"dockerfile": "pytorch/Dockerfile",
167+
"repo": "intel/intel-optimized-pytorch",
168+
"tag": "2.4.0-idp-hf-4.44.0-genai"
169+
},
170+
{
171+
"base": "ubuntu:22.04",
172+
"dockerfile": "pytorch/Dockerfile",
173+
"repo": "intel/intel-optimized-pytorch",
174+
"tag": "2.4.0-serving-cpu"
175+
},
176+
{
177+
"base": "ubuntu:22.04",
178+
"dockerfile": "pytorch/Dockerfile",
179+
"repo": "intel/intel-optimized-pytorch",
180+
"tag": "2.4.0-serving-xpu"
181+
},
182+
{
183+
"base": "ubuntu:22.04",
184+
"dockerfile": "preset/classical-ml/Dockerfile",
185+
"repo": "intel/classical-ml",
186+
"tag": "latest-py3.9"
187+
},
188+
{
189+
"base": "ubuntu:22.04",
190+
"dockerfile": "preset/classical-ml/Dockerfile",
191+
"repo": "intel/classical-ml",
192+
"tag": "latest-py3.10"
193+
},
194+
{
195+
"base": "ubuntu:22.04",
196+
"dockerfile": "preset/data-analytics/Dockerfile",
197+
"repo": "intel/data-analytics",
198+
"tag": "latest-py3.9"
199+
},
200+
{
201+
"base": "ubuntu:22.04",
202+
"dockerfile": "preset/data-analytics/Dockerfile",
203+
"repo": "intel/data-analytics",
204+
"tag": "latest-py3.10"
205+
},
206+
{
207+
"base": "ubuntu:22.04",
208+
"dockerfile": "preset/deep-learning/Dockerfile",
209+
"repo": "intel/deep-learning",
210+
"tag": "latest-py3.9"
211+
},
212+
{
213+
"base": "ubuntu:22.04",
214+
"dockerfile": "preset/deep-learning/Dockerfile",
215+
"repo": "intel/deep-learning",
216+
"tag": "latest-py3.10"
217+
},
218+
{
219+
"base": "ubuntu:22.04",
220+
"dockerfile": "preset/inference-optimization/Dockerfile",
221+
"repo": "intel/inference-optimization",
222+
"tag": "latest-py3.9"
223+
},
224+
{
225+
"base": "ubuntu:22.04",
226+
"dockerfile": "preset/inference-optimization/Dockerfile",
227+
"repo": "intel/inference-optimization",
228+
"tag": "latest-py3.10"
229+
}
230+
]

classical-ml/.actions.json

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

preset/classical-ml/.actions.json

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

preset/classical-ml/tests.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
# img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py3.9
2222
modin-${PYTHON_VERSION:-3.9}:
2323
cmd: conda run -n classical-ml sample-tests/modin/test_modin.sh
24-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
24+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
2525
shm_size: 10.24G
2626
modin-notebook-${PYTHON_VERSION:-3.9}:
2727
cmd: papermill --log-output jupyter/modin/IntelModin_Vs_Pandas.ipynb -k classical-ml
28-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
28+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
2929
notebook: True
3030
scikit-${PYTHON_VERSION:-3.9}:
3131
cmd: conda run -n classical-ml sample-tests/scikit/test_scikit.sh
32-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
32+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
3333
scikit-notebook-${PYTHON_VERSION:-3.9}:
3434
cmd: papermill --log-output jupyter/sklearn/Intel_Extension_For_SKLearn_GettingStarted.ipynb -k classical-ml
35-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
35+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
3636
notebook: True
3737
xgboost-${PYTHON_VERSION:-3.9}:
3838
cmd: conda run -n classical-ml sample-tests/xgboost/test_xgboost.sh
39-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
39+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
4040
xgboost-notebook-${PYTHON_VERSION:-3.9}:
4141
cmd: papermill --log-output jupyter/xgboost/IntelPython_XGBoost_Performance.ipynb -k classical-ml
42-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
42+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-classical-ml-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
4343
notebook: True

preset/data-analytics/.actions.json

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

preset/data-analytics/tests.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
dataset-librarian-${PYTHON_VERSION:-3.9}:
1616
cmd: conda run -n data-analytics bash -c 'yes | python -m dataset_librarian.dataset -n msmarco --download -d ~/msmarco'
17-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
17+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
1818
modin-${PYTHON_VERSION:-3.9}:
1919
cmd: conda run -n data-analytics sample-tests/modin/test_modin.sh
20-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
20+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
2121
shm_size: 10G
2222
modin-notebook-${PYTHON_VERSION:-3.9}:
2323
cmd: papermill --log-output jupyter/modin/IntelModin_Vs_Pandas.ipynb -k data-analytics
24-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.1.0}-py${PYTHON_VERSION:-3.9}
24+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-data-analytics-${RELEASE:-2024.2.0}-py${PYTHON_VERSION:-3.9}
2525
notebook: True

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": ["PVC"]
4+
"runner_label": ["clx"]
55
}

test-runner/dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ coverage>=7.5.0
33
coveralls>=4.0.1
44
expandvars>=0.12.0
55
hypothesis>=6.100.1
6-
pydantic==2.8.2
6+
pydantic==2.9.1
77
pylint>=3.1.0
88
pytest>=8.1.1
99
python_on_whales>=0.70.1

test-runner/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
expandvars>=0.12.0
2-
pydantic==2.8.2
2+
pydantic==2.9.1
33
python_on_whales>=0.70.1
44
pyyaml>=6.0.1
55
tabulate>=0.9.0

0 commit comments

Comments
 (0)