Skip to content

Commit a08fa32

Browse files
minmingzhuminmingzhu
authored
[ML-413] upgrade oneapi for CI and fix Token-Permissions error (#414)
* update oneapi for CI Signed-off-by: minmingzhu <minming.zhu@intel.com> * update Signed-off-by: minmingzhu <minming.zhu@intel.com> * update Signed-off-by: minmingzhu <minming.zhu@intel.com> * update ubuntu to latest Signed-off-by: minmingzhu <minming.zhu@intel.com> * update clang-format Signed-off-by: minmingzhu <minming.zhu@intel.com> * format cpp style Signed-off-by: minmingzhu <minming.zhu@intel.com> * update jackson-databind version to 2.13.4 Signed-off-by: minmingzhu <minming.zhu@intel.com> * update CI yaml Signed-off-by: minmingzhu <minming.zhu@intel.com> * Update dev_cron.yml * correct Oneapi version in yml Signed-off-by: minmingzhu <minming.zhu@intel.com> --------- Signed-off-by: minmingzhu <minming.zhu@intel.com>
1 parent a8237df commit a08fa32

10 files changed

Lines changed: 40 additions & 43 deletions

File tree

‎.github/workflows/ci-checks-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: # added using https://github.com/step-security/secure-repo
88
jobs:
99
code-checks-scala:
1010
name: Code Checks for Scala
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1414
- name: Set up JDK 1.8
@@ -22,7 +22,7 @@ jobs:
2222
2323
code-checks-java:
2424
name: Code Checks for Java
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2828
- name: Set up JDK 1.8
@@ -36,21 +36,21 @@ jobs:
3636
3737
code-checks-cpp:
3838
name: Code Checks for C++
39-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-latest
4040
steps:
4141
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
4242
- name: Install clang-format
4343
run: |
4444
sudo apt-get update
45-
sudo apt-get install -y clang-format-10
45+
sudo apt-get install -y clang-format
4646
- name: Check C++ code
4747
run: |
4848
cd ${{github.workspace}}/mllib-dal/src/main/native
4949
${{github.workspace}}/dev/code-checks/lint-cpp.sh
5050
5151
code-build:
5252
name: Build Checks
53-
runs-on: ubuntu-20.04
53+
runs-on: ubuntu-latest
5454
steps:
5555
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
5656
- name: Set up JDK 1.8
@@ -65,7 +65,7 @@ jobs:
6565
~/.m2/repository
6666
/opt/intel/oneapi
6767
~/opt
68-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
68+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
6969
restore-keys: |
7070
${{ runner.os }}-
7171
- name: Build Test for CPU and GPU

‎.github/workflows/ci-tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: # added using https://github.com/step-security/secure-repo
88
jobs:
99
local-test-oneAPI_table:
1010
name: Local Test for Units (OneAPI Table)
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1414
- name: Set up JDK 1.8
@@ -23,15 +23,15 @@ jobs:
2323
~/.m2/repository
2424
/opt/intel/oneapi
2525
~/opt
26-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
26+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
2727
restore-keys: |
2828
${{ runner.os }}-
2929
- name: Local Test
3030
run: |
3131
${{github.workspace}}/dev/ci/ci-local-dpc-test.sh
3232
local-test-CPU:
3333
name: Local Test for Units (CPU)
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-latest
3535
steps:
3636
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
3737
- name: Set up JDK 1.8
@@ -46,7 +46,7 @@ jobs:
4646
~/.m2/repository
4747
/opt/intel/oneapi
4848
~/opt
49-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
49+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
5050
restore-keys: |
5151
${{ runner.os }}-
5252
- name: Local Test
@@ -55,7 +55,7 @@ jobs:
5555
yarn-test:
5656
if: ${{ false }} # disable for now
5757
name: Yarn Test for Examples (CPU)
58-
runs-on: ubuntu-20.04
58+
runs-on: ubuntu-latest
5959
steps:
6060
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
6161
- name: Set up JDK 1.8
@@ -70,15 +70,15 @@ jobs:
7070
~/.m2/repository
7171
/opt/intel/oneapi
7272
~/opt
73-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
73+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
7474
restore-keys: |
7575
${{ runner.os }}-
7676
- name: Cluster Test
7777
run: |
7878
${{github.workspace}}/dev/ci/ci-yarn-test-cpu.sh
7979
standalone-scala-test:
8080
name: Standalone CPU_GPU_PROFILE Test for scala Examples (CPU)
81-
runs-on: ubuntu-20.04
81+
runs-on: ubuntu-latest
8282
steps:
8383
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
8484
- name: Set up JDK 1.8
@@ -93,15 +93,15 @@ jobs:
9393
~/.m2/repository
9494
/opt/intel/oneapi
9595
~/opt
96-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
96+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
9797
restore-keys: |
9898
${{ runner.os }}-
9999
- name: Cluster Test
100100
run: |
101101
${{github.workspace}}/dev/ci/ci-standalone-scala-test-cpu.sh
102102
standalone-python-test:
103103
name: Standalone CPU_GPU_PROFILE Test for python Examples (CPU)
104-
runs-on: ubuntu-20.04
104+
runs-on: ubuntu-latest
105105
steps:
106106
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
107107
- name: Set up JDK 1.8
@@ -116,7 +116,7 @@ jobs:
116116
~/.m2/repository
117117
/opt/intel/oneapi
118118
~/opt
119-
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2023.0.0
119+
key: ${{ runner.os }}_spark-3.3.3_hadoop-3.2.0_oneapi-2025.2
120120
restore-keys: |
121121
${{ runner.os }}-
122122
- name: Cluster Test

‎.github/workflows/dev_cron.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ on:
2727

2828
permissions:
2929
issues: write
30-
contents: write
30+
pull-requests: write
31+
contents: read
3132

3233
jobs:
3334
process:
3435
name: Process
3536
runs-on: ubuntu-latest
3637
steps:
3738
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
38-
3939
- name: Comment Issues link
4040
if: |
4141
github.event_name == 'pull_request_target' &&

‎dev/code-checks/lint-cpp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
CLANG_FORMAT=$(which clang-format-10)
17+
CLANG_FORMAT=$(which clang-format)
1818
CLANG_FORMAT_VERSION=$($CLANG_FORMAT --version)
1919

2020
if [ -z $CLANG_FORMAT ]; then

‎dev/install-build-deps-centos.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ repo_gpgcheck=1
1313
gpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
1414
EOF
1515
sudo mv /tmp/oneAPI.repo /etc/yum.repos.d
16-
sudo yum install -y intel-oneapi-ccl-devel-2021.8.0 \
17-
intel-oneapi-tbb-common-devel-2021.8.0 intel-oneapi-tbb-devel-2021.8.0 \
18-
intel-oneapi-mpi-devel-2021.8.0 \
19-
intel-oneapi-dal-common-devel-2023.0.0 intel-oneapi-dal-devel-2023.0.0 \
20-
intel-oneapi-compiler-dpcpp-cpp-2023.0.0 intel-oneapi-compiler-dpcpp-cpp-common-2023.0.0 intel-oneapi-compiler-dpcpp-cpp-runtime-2023.0.0 intel-oneapi-dpcpp-cpp-2023.0.0
16+
sudo yum install -y intel-oneapi-ccl-devel-2021.16 \
17+
intel-oneapi-tbb-common-devel-2021.13 intel-oneapi-tbb-devel-2022.2 \
18+
intel-oneapi-mpi-devel-2021.16 \
19+
intel-oneapi-dal-common-devel-2025.6 intel-oneapi-dal-devel-2025.6 \
20+
intel-oneapi-compiler-dpcpp-cpp-2025.3 intel-oneapi-compiler-dpcpp-cpp-common-2025.3 intel-oneapi-compiler-dpcpp-cpp-runtime-2025.3 intel-oneapi-dpcpp-cpp-2025.3
2121
else
2222
echo "oneAPI components already installed!"
2323
fi

‎dev/install-build-deps-ubuntu.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ if [ ! -d /opt/intel/oneapi ]; then
44
echo "Installing oneAPI components ..."
55
sudo apt clean
66
cd /tmp
7-
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
8-
| gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
7+
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
98
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
109
sudo apt update
11-
sudo apt-get install -y intel-oneapi-ccl-devel-2021.8.0 \
12-
intel-oneapi-tbb-common-devel-2021.8.0 intel-oneapi-tbb-devel-2021.8.0 \
13-
intel-oneapi-mpi-devel-2021.8.0 \
14-
intel-oneapi-dal-common-devel-2023.0.0 intel-oneapi-dal-devel-2023.0.0 \
15-
intel-oneapi-compiler-dpcpp-cpp-2023.0.0 intel-oneapi-compiler-dpcpp-cpp-common-2023.0.0 intel-oneapi-compiler-dpcpp-cpp-runtime-2023.0.0 intel-oneapi-dpcpp-cpp-2023.0.0
10+
sudo apt-get install -y intel-oneapi-ccl-devel-2021.16 \
11+
intel-oneapi-tbb-common-devel-2021.13 intel-oneapi-tbb-devel-2022.2 \
12+
intel-oneapi-mpi-devel-2021.16 \
13+
intel-oneapi-dal-common-devel-2025.6 intel-oneapi-dal-devel-2025.6 \
14+
intel-oneapi-compiler-dpcpp-cpp-2025.3 intel-oneapi-compiler-dpcpp-cpp-common-2025.3 intel-oneapi-compiler-dpcpp-cpp-runtime-2025.3 intel-oneapi-dpcpp-cpp-2025.3
1615
else
1716
echo "oneAPI components already installed!"
1817
fi

‎dev/install-runtime-deps-centos.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ repo_gpgcheck=1
1313
gpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
1414
EOF
1515
sudo mv /tmp/oneAPI.repo /etc/yum.repos.d
16-
sudo yum install -y intel-oneapi-ccl-2021.8.0 \
17-
intel-oneapi-mpi-2021.8.0 \
18-
intel-oneapi-compiler-dpcpp-cpp-runtime-2023.0.0 intel-oneapi-dpcpp-cpp-2023.0.0
16+
sudo yum install -y intel-oneapi-ccl-2021.16 \
17+
intel-oneapi-mpi-2021.16 \
18+
intel-oneapi-compiler-dpcpp-cpp-runtime-2025.3 intel-oneapi-dpcpp-cpp-2025.3
1919
else
2020
echo "oneAPI components already installed!"
2121
fi

‎dev/install-runtime-deps-ubuntu.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ if [ ! -d /opt/intel/oneapi ]; then
44
echo "Installing oneAPI components ..."
55
sudo apt clean
66
cd /tmp
7-
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
8-
| gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
7+
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
98
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
109
sudo apt update
11-
sudo apt-get install -y intel-oneapi-ccl-2021.8.0 \
12-
intel-oneapi-mpi-2021.8.0 \
13-
intel-oneapi-compiler-dpcpp-cpp-runtime-2023.0.0 intel-oneapi-dpcpp-cpp-2023.0.0
10+
sudo apt-get install -y intel-oneapi-ccl-2021.16 \
11+
intel-oneapi-mpi-2021.16 \
12+
intel-oneapi-compiler-dpcpp-cpp-runtime-2025.3 intel-oneapi-dpcpp-cpp-2025.3
1413
else
1514
echo "oneAPI components already installed!"
1615
fi

‎mllib-dal/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<dependency>
193193
<groupId>com.fasterxml.jackson.core</groupId>
194194
<artifactId>jackson-databind</artifactId>
195-
<version>2.12.3</version>
195+
<version>2.13.4</version>
196196
</dependency>
197197
<dependency>
198198
<groupId>org.apache.commons</groupId>

‎mllib-dal/src/main/native/service.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,8 @@ NumericTablePtr homegenToSyclHomogen(NumericTablePtr ntHomogen) {
212212

213213
// printNumericTable(ntHomogen, "ntHomogen:", 10, 10);
214214

215-
NumericTablePtr ntSycl =
216-
HomogenNumericTable<CpuAlgorithmFPType>::create(
217-
nColumns, nRows, NumericTable::doAllocate);
215+
NumericTablePtr ntSycl = HomogenNumericTable<CpuAlgorithmFPType>::create(
216+
nColumns, nRows, NumericTable::doAllocate);
218217

219218
// printNumericTable(ntSycl, "ntSycl:", 10, 10);
220219

0 commit comments

Comments
 (0)