Skip to content

Commit 65f6295

Browse files
authored
dpcpp : update to v6.0.1 (#4)
* dpcpp : update to v6.0.1 * try without bleeding edge cmake * try using pip to install cmake * try using pip to install cmake * try using pip to install cmake
1 parent b8e273d commit 65f6295

5 files changed

Lines changed: 20 additions & 38 deletions

File tree

.github/workflows/build-and-push.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ jobs:
9797
push: ${{ github.event_name != 'pull_request' }}
9898
tags: ${{ steps.meta.outputs.tags }}
9999
labels: ${{ steps.meta.outputs.labels }}
100-
cache-from: type=gha,scope=cache-${{ inputs.imagename }}
101-
cache-to: type=gha,mode=max,scope=cache-${{ inputs.imagename }}
102100
build-args: |
103101
BRANCHNAME=${{ github.ref_name }}
104102

images/ubuntu20dpcpp_cuda12/install_dpcpp.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@ mkdir compilers
88
###################################
99
#update cmake
1010
sudo apt-get update
11-
sudo apt-get install -y ca-certificates gpg wget
12-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14-
sudo apt-get update
15-
sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16-
sudo apt-get install -y kitware-archive-keyring
17-
sudo apt-get update
18-
sudo apt-get install -y cmake
19-
11+
sudo pip3 install cmake==3.31.6
2012

2113
#esimd requirement
2214
sudo apt install -y libva-dev libffi-dev libtool
@@ -32,7 +24,7 @@ clinfo
3224
###################################
3325
cd /home/docker/compilers_gits
3426

35-
git clone https://github.com/intel/llvm --depth=1 -b v6.0.0
27+
git clone https://github.com/intel/llvm --depth=1 -b v6.0.1
3628

3729
cd /home/docker/compilers_gits/llvm
3830

images/ubuntu20dpcpp_rocm5.4.3/install_dpcpp.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@ mkdir compilers
88
###################################
99
#update cmake
1010
sudo apt-get update
11-
sudo apt-get install -y ca-certificates gpg wget
12-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14-
sudo apt-get update
15-
sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16-
sudo apt-get install -y kitware-archive-keyring
17-
sudo apt-get update
18-
sudo apt-get install -y cmake
19-
11+
sudo pip3 install cmake==3.31.6
2012

2113
#esimd requirement
2214
sudo apt install -y libva-dev libffi-dev libtool
@@ -33,7 +25,7 @@ clinfo
3325

3426
cd /home/docker/compilers_gits
3527

36-
git clone https://github.com/intel/llvm --depth=1 -b v6.0.0
28+
git clone https://github.com/intel/llvm --depth=1 -b v6.0.1
3729

3830
cd /home/docker/compilers_gits/llvm
3931

images/ubuntu22dpcpp_cuda12/install_dpcpp.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ mkdir compilers
88
###################################
99
#update cmake
1010
sudo apt-get update
11-
sudo apt-get install -y ca-certificates gpg wget
12-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14-
sudo apt-get update
15-
sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16-
sudo apt-get install -y kitware-archive-keyring
17-
sudo apt-get update
11+
#sudo apt-get install -y ca-certificates gpg wget
12+
#wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13+
#echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14+
#sudo apt-get update
15+
#sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16+
#sudo apt-get install -y kitware-archive-keyring
17+
#sudo apt-get update
1818
sudo apt-get install -y cmake
1919

2020

@@ -32,7 +32,7 @@ clinfo
3232
###################################
3333
cd /home/docker/compilers_gits
3434

35-
git clone https://github.com/intel/llvm --depth=1 -b v6.0.0
35+
git clone https://github.com/intel/llvm --depth=1 -b v6.0.1
3636

3737
cd /home/docker/compilers_gits/llvm
3838

images/ubuntu22dpcpp_rocm5.4.3/install_dpcpp.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ mkdir compilers
88
###################################
99
#update cmake
1010
sudo apt-get update
11-
sudo apt-get install -y ca-certificates gpg wget
12-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14-
sudo apt-get update
15-
sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16-
sudo apt-get install -y kitware-archive-keyring
17-
sudo apt-get update
11+
#sudo apt-get install -y ca-certificates gpg wget
12+
#wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
13+
#echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
14+
#sudo apt-get update
15+
#sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
16+
#sudo apt-get install -y kitware-archive-keyring
17+
#sudo apt-get update
1818
sudo apt-get install -y cmake
1919

2020

@@ -33,7 +33,7 @@ clinfo
3333

3434
cd /home/docker/compilers_gits
3535

36-
git clone https://github.com/intel/llvm --depth=1 -b v6.0.0
36+
git clone https://github.com/intel/llvm --depth=1 -b v6.0.1
3737

3838
cd /home/docker/compilers_gits/llvm
3939

0 commit comments

Comments
 (0)