Skip to content

Swap compilers in tag to match linux images #762

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

Open
wmaxey wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Swap compilers in tag to match linux images #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fd40e7
Swap compilers in tag to match linux images
wmaxey Sep 2, 2026
b19bea9
Swap compilers in generated image name
wmaxey Sep 2, 2026
0c69103
Update documentation references where the old compiler order was used
wmaxey Sep 2, 2026
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 .github/workflows/build-test-and-push-windows-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
cl="$(echo "$INPUT_FEATURES" | jq -r '.[1].version')";
cuda="$(echo "$INPUT_FEATURES" | jq -r '.[0].version')";
version="$(git describe --abbrev=0 --tags --first-parent | sed 's/[a-zA-Z]//g' | cut -d '.' -f -2)";
base_tag="cuda${cuda}-cl${cl}";
base_tag="cl${cl}-cuda${cuda}";
tag_without_os="${version}-${base_tag}";
cat <<EOF | tee "$GITHUB_OUTPUT"
cl=${cl}
Expand Down
2 changes: 1 addition & 1 deletion windows/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IMAGE_NAME=local:cudalatest-cllatest-windows2019
IMAGE_NAME=local:cllatest-cudalatest-windows2019
ISOLATION=hyperv
MSVC_VER=17
MSVC_COMPILER_VER=latest
Expand Down
2 changes: 1 addition & 1 deletion windows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Build desired configuration. Windows 2019 and Windows 2022 versions map to Windo

Start up the container and mount workspace directories as needed.

`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:windows-cuda-12.1-cl-14.36 powershell`
`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:latest-cl14.36-cuda12.1-windows2019 powershell`

### Step 3 - Build your projects

Expand Down
14 changes: 7 additions & 7 deletions windows/generate-image-name.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# msvcVersion, cudaVersion, OS edition, isolation mode
Param(
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]
$clVersion,
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]
$cudaVersion,
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]
$edition,
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]
$repo,
[Parameter(Mandatory=$false)]
[Parameter(Mandatory = $false)]
[string]
$repoVersion="latest"
$repoVersion = "latest"
)

Write-Output "${repo}:${repoVersion}-cuda${cudaVersion}-cl${clVersion}-${edition}"
Write-Output "${repo}:${repoVersion}-cl${clVersion}-cuda${cudaVersion}-${edition}"
Loading