Skip to content

Commit c8d03cf

Browse files
author
Tyler Titsworth
authored
Merge branch 'main' into tylertitsworth/codeowner-coverage
2 parents 740794e + 35018f7 commit c8d03cf

File tree

7 files changed

+82
-21
lines changed

7 files changed

+82
-21
lines changed

‎.github/workflows/weekly-test.yaml

-16
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
uses: intel/ai-containers/.github/workflows/container-ci.yaml@main
5151
with:
5252
group_dir: ${{ matrix.group }}
53-
ref: main
5453
secrets: inherit
5554
# helm-ci:
5655
# runs-on: kubectl
@@ -67,18 +66,3 @@ jobs:
6766
# config: '--all --namespace helm-ci'
6867
# list_changed: false
6968
# kubeconfig_path: ${{ secrets.KUBECONFIG_PATH }}
70-
scan:
71-
name: gitleaks
72-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
73-
steps:
74-
- name: Harden Runner
75-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
76-
with:
77-
egress-policy: audit
78-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
79-
with:
80-
fetch-depth: 0
81-
- uses: gitleaks/gitleaks-action@44c470ffc35caa8b1eb3e8012ca53c2f9bea4eb5 # v2.3.6
82-
env:
83-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
84-
GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE}}

‎classical-ml/README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ The images below include [Intel® Extension for Scikit-learn*] and [XGBoost*].
1010

1111
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
1212
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
13-
| `2024.6.0-pip-base`, `latest` | [v2024.6.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
13+
| `2024.7.0-pip-base`, `latest` | [v2024.7.0] | [v1.5.2] | [v2.1.1] | [v0.4.0] |
14+
| `2024.6.0-pip-base` | [v2024.6.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
1415
| `2024.5.0-pip-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
1516
| `2024.3.0-pip-base` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
1617
| `2024.2.0-xgboost-2.0.3-pip-base` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
@@ -20,6 +21,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s
2021

2122
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
2223
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
24+
| `2024.7.0-pip-jupyter` | [v2024.7.0] | [v1.5.2] | [v2.1.1] | [v0.4.0] |
2325
| `2024.6.0-pip-jupyter` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
2426
| `2024.5.0-pip-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
2527
| `2024.3.0-pip-jupyter` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
@@ -45,6 +47,7 @@ The images below include [Intel® Distribution for Python*]:
4547

4648
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
4749
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
50+
| `2024.7.0-idp-base` | [v2024.7.0] | [v1.5.2] | [v2.1.1] | [v0.4.0] |
4851
| `2024.6.0-idp-base` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
4952
| `2024.5.0-idp-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
5053
| `2024.3.0-idp-base` | [v2024.3.0] | [v1.4.1] | [v2.1.0] | [v0.4.0] |
@@ -55,6 +58,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s
5558

5659
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
5760
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
61+
| `2024.7.0-idp-jupyter` | [v2024.7.0] | [v1.5.2] | [v2.1.1] | [v0.4.0] |
5862
| `2024.6.0-idp-jupyter` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
5963
| `2024.5.0-idp-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
6064
| `2024.3.0-idp-jupyter` | [v2024.3.0] | [v1.4.0] | [v2.1.0] | [v0.4.0] |
@@ -95,12 +99,14 @@ It is the image user's responsibility to ensure that any use of The images below
9599
[Scikit-learn*]: https://scikit-learn.org/stable/
96100
[XGBoost*]: https://github.com/dmlc/xgboost
97101

102+
[v2024.7.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.7.0
98103
[v2024.6.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.6.0
99104
[v2024.5.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.5.0
100105
[v2024.3.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.3.0
101106
[v2024.2.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.2.0
102107
[v2024.0.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.0.0
103108

109+
[v1.5.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.2
104110
[v1.5.1]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.1
105111
[v1.5.0]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.0
106112
[v1.4.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.2

‎enterprise/redhat/openshift-ai/gaudi/docker/.actions.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"RHEL_OS": ["9.2"],
3+
"experimental": [true],
4+
"runner_label": ["gaudi2"]
5+
}

‎enterprise/redhat/openshift-ai/gaudi/docker/Dockerfile.rhel9.2

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,6 @@ RUN cd ${APP_ROOT}/ && \
231231
VLLM_TARGET_DEVICE=hpu pip install -e .
232232

233233
WORKDIR ${APP_ROOT}/src
234-
ENV NOTEBOOK_SAMPLE_LINK="https://raw.githubusercontent.com/sharvil10/ai-containers/main/enterprise/redhat/openshift-ai/gaudi/demo/Getting-started.ipynb"
234+
ENV NOTEBOOK_SAMPLES_LINK="https://raw.githubusercontent.com/intel/ai-containers/refs/heads/main/enterprise/redhat/openshift-ai/gaudi/demo/oneapi-sample.ipynb"
235235

236236
ENTRYPOINT ["bash", "-c", "/opt/app-root/builder/run"]

‎enterprise/redhat/openshift-ai/gaudi/docker/docker-compose.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ services:
2727
context: .
2828
target: gaudi-base
2929
dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
30-
image: gaudi-base:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
30+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-base-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
31+
entrypoint: ["/bin/bash", "-c"]
32+
command: >
33+
"hl-smi"
3134
gaudi-pytorch:
3235
build:
3336
args:
@@ -44,7 +47,10 @@ services:
4447
context: .
4548
target: gaudi-pytorch
4649
dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
47-
image: gaudi-pytorch:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
50+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-pytorch-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
51+
entrypoint: ["/bin/bash", "-c"]
52+
command: >
53+
"python -c 'import torch'"
4854
gaudi-notebooks:
4955
build:
5056
args:
@@ -61,4 +67,7 @@ services:
6167
context: .
6268
target: gaudi-notebooks
6369
dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
64-
image: gaudi-notebooks:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
70+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-notebook-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
71+
entrypoint: ["/bin/bash", "-c"]
72+
command: >
73+
"python -m jupyter notebook --version"

‎enterprise/redhat/openshift-ai/gaudi/docker/tests/notebook-test.sh

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
3+
# Copyright (c) 2024 Intel Corporation
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -e
18+
19+
apt-get -y update
20+
apt-get -y install curl jq
21+
22+
echo 'Testing if server is running'
23+
curl --fail -s -X GET http://localhost:8888/api/status
24+
echo ''
25+
26+
echo 'Test if oneapi-sample was downloaded'
27+
if [[ $(curl --fail -s -X GET http://localhost:8888/api/contents | jq -r '.content[] | select(.name=="oneapi-sample.ipynb")') ]]; then
28+
echo 'oneapi-sample.ipynb was downloaded'
29+
else
30+
echo 'oneapi-sample.ipynb was not downloaded'
31+
fi

‎enterprise/redhat/openshift-ai/gaudi/docker/tests/tests.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright (c) 2024 Intel Corporation
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
test-jupyter-server:
16+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-base-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
17+
cmd: bash /opt/app-root/notebook-test.sh
18+
serving: True
19+
volumes:
20+
- src: $PWD/enterprise/redhat/openshift-ai/gaudi/docker/tests/notebook-test.sh
21+
dst: /opt/app-root/notebook-test.sh
22+
env:
23+
NOTEBOOK_ARGS: "--ServerApp.token='' --ServerApp.PasswordIdentityProvider.hashed_password=''"
24+
NOTEBOOK_PORT: '8888'
25+
NOTEBOOK_SAMPLES_LINK: 'https://raw.githubusercontent.com/intel/ai-containers/refs/heads/main/enterprise/redhat/openshift-ai/gaudi/demo/oneapi-sample.ipynb'
26+
shm_size: 1g

0 commit comments

Comments
 (0)