Skip to content

Update VMs for July 2022 Patch Tuesday, and to Ubuntu 22.04. #25785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 10 commits into from
Jul 16, 2022
Merged

Update VMs for July 2022 Patch Tuesday, and to Ubuntu 22.04. #25785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
308f241
Update Ubuntu to 22.04.
BillyONeal Jul 11, 2022
6543c43
Add libxtst-dev from https://github.com/microsoft/vcpkg/pull/24934
BillyONeal Jul 11, 2022
600b8c9
Add standard prereqs.
BillyONeal Jul 12, 2022
687fc71
Update some package references for Ubuntu 22.04.
BillyONeal Jul 12, 2022
4d1bc9f
[cuda] Update to search in /usr/bin as used on Ubuntu 22.04.
BillyONeal Jul 12, 2022
f76e452
[cudnn] Add where ubuntu 22.04 puts it.
BillyONeal Jul 12, 2022
b374466
Add update-nvidia-cudnn calls.
BillyONeal Jul 12, 2022
27c63e3
Update powershell to 7.2.5
BillyONeal Jul 13, 2022
61c2b3f
Re-add NCCL installation from CUDA official sources.
BillyONeal Jul 14, 2022
0e009b1
Update pools.
BillyONeal Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/cuda/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cuda",
"version": "10.1",
"port-version": 10,
"port-version": 11,
"description": "A parallel computing platform and programming model",
"homepage": "https://developer.nvidia.com/cuda-toolkit",
"license": null,
Expand Down
2 changes: 2 additions & 0 deletions ports/cuda/vcpkg_find_cuda.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ function(vcpkg_find_cuda)
endif()
endforeach()

vcpkg_list(APPEND CUDA_PATHS /usr/bin)

find_program(NVCC
NAMES nvcc
PATHS
Expand Down
2 changes: 1 addition & 1 deletion ports/cudnn/FindCUDNN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
include(FindPackageHandleStandardArgs)

find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include
HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/
PATH_SUFFIXES cuda/include include)
find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/
Expand Down
2 changes: 1 addition & 1 deletion ports/cudnn/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VE

# Try to find CUDNN if it exists; only download if it doesn't exist
find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/
PATH_SUFFIXES cuda/include include)
message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}")
find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
Expand Down
2 changes: 1 addition & 1 deletion ports/cudnn/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cudnn",
"version": "7.6.5",
"port-version": 7,
"port-version": 8,
"description": "NVIDIA's cuDNN deep neural network acceleration library.",
"homepage": "https://developer.nvidia.com/cudnn",
"license": null,
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# SPDX-License-Identifier: MIT
#
variables:
windows-pool: 'PrWin-2022-06-15'
linux-pool: 'PrLin-2022-06-15'
windows-pool: 'PrWin-2022-07-14'
linux-pool: 'PrLin-2022-07-14'
osx-pool: 'PrOsx-2022-02-04'

parameters:
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/linux/create-image.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
$VM = Set-AzVMSourceImage `
-VM $VM `
-PublisherName 'Canonical' `
-Offer '0001-com-ubuntu-server-focal' `
-Skus '20_04-lts' `
-Offer '0001-com-ubuntu-server-jammy' `
-Skus '22_04-lts' `
-Version latest

$VM = Set-AzVMBootDiagnostic -VM $VM -Disable
Expand Down
37 changes: 25 additions & 12 deletions scripts/azure-pipelines/linux/provision-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,29 @@ export DEBIAN_FRONTEND=noninteractive

apt-get -y update
apt-get -y dist-upgrade

# Install vcpkg prerequisites
APT_PACKAGES="git curl zip unzip tar"

# Install common build dependencies
APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \
APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \
build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \
libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \
libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
libxcursor-dev yasm libnuma1 libnuma-dev \
flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \
pkg-config meson nasm cmake ninja-build"

# CUDA tooling
APT_PACKAGES="$APT_PACKAGES nvidia-cudnn nvidia-cuda-toolkit"

# Additionally required by qt5-base
APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev"

# Additionally required by qt5-base for qt5-x11extras
APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \
libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev \
libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \
libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \
libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev"

Expand Down Expand Up @@ -56,22 +63,28 @@ APT_PACKAGES="$APT_PACKAGES libxdamage-dev"
# Additionally required by gtk3 and at-spi2-atk
APT_PACKAGES="$APT_PACKAGES libdbus-1-dev"
Copy link
Contributor

@JackBoosY JackBoosY Jul 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
APT_PACKAGES="$APT_PACKAGES libdbus-1-dev"
APT_PACKAGES="$APT_PACKAGES libdbus-1-dev libxtst-dev"

Copy link
Member Author

@BillyONeal BillyONeal Jul 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's kinda too late. When I make this PR the image with the new configuration is already minted. :(

Copy link
Contributor

@dg0yt dg0yt Jul 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC it is included three lines later?

Copy link
Member Author

@BillyONeal BillyONeal Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC it is included three lines later?

I don't see it

image

Copy link
Contributor

@talregev talregev Jul 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be later in the script.

Copy link
Contributor

@talregev talregev Jul 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you show screen shots later on the script? It should near the line of libdbus-1-dev

Copy link
Contributor

@talregev talregev Jul 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the old version of the script. The changes from this PR don't show up. Can you fix that?

Copy link
Member Author

@BillyONeal BillyONeal Jul 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the old version of the script. The changes from this PR don't show up. Can you fix that?

Derp :)

Copy link
Contributor

@talregev talregev Jul 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the old version of the script. The changes from this PR don't show up. Can you fix that?

Derp :)

How can we fix it?

Copy link
Member Author

@BillyONeal BillyONeal Jul 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whack Bill over the head


# Additionally required by at-spi2-atk
APT_PACKAGES="$APT_PACKAGES libxtst-dev"

# Additionally required/installed by Azure DevOps Scale Set Agents
APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66"
APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70"

apt-get -y install $APT_PACKAGES

# Install the latest Haskell stack for bond
curl -sSL https://get.haskellstack.org/ | sh

# Install CUDA
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
# Start up cudnn
update-nvidia-cudnn -d
update-nvidia-cudnn -u

# Install nccl
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin
mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /"
apt-get -y update
apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \
cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev
apt-get install --no-install-recommends libnccl2 libnccl-dev

# Install PowerShell
wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows/deploy-pwsh.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

# REPLACE WITH UTILITY-PREFIX.ps1

$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi'
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi'
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
8 changes: 4 additions & 4 deletions scripts/vcpkgTools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@
<archiveName>ninja-freebsd-1.8.2.zip</archiveName>
</tool>
<tool name="powershell-core" os="windows">
<version>7.2.4</version>
<version>7.2.5</version>
<exeRelativePath>pwsh.exe</exeRelativePath>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.zip</url>
<sha512>4f337c66e03124cfc1e96a56a943ccd24f9a22f588fa461bea9e14733acf06acddd873860b10843c92251257a64fbfac967ae77c084960aaf6b14522435b7769</sha512>
<archiveName>PowerShell-7.2.4-win-x86.zip</archiveName>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.zip</url>
<sha512>75b549db2500a5510eae3ec595540b42726c1b049f382c7683b6f0ed26dddd219e2ac67e9902358615f96c7884eda63ec3d0ca558b7b92f4604fdc61322ca4dd</sha512>
<archiveName>PowerShell-7.2.5-win-x86.zip</archiveName>
</tool>
<tool name="node" os="windows">
<version>16.15.1</version>
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,11 +1750,11 @@
},
"cuda": {
"baseline": "10.1",
"port-version": 10
"port-version": 11
},
"cudnn": {
"baseline": "7.6.5",
"port-version": 7
"port-version": 8
},
"cunit": {
"baseline": "2.1.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cuda.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1d190177076c48287897d233ae2fa8c241f28f40",
"version": "10.1",
"port-version": 11
},
{
"git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c",
"version": "10.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cudnn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b29eb71b5187d6f0991ede2a56e2fda57e6cb520",
"version": "7.6.5",
"port-version": 8
},
{
"git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588",
"version": "7.6.5",
Expand Down