Skip to content

Commit 8d58988

Browse files
lanluo-nvidialanluo-nvidia
authored
[CI] added ubuntu 22.04 container (#764)
two changes when upgrade from rockylinux8 to 9: 1) curl already bundled inside rockylinux9 2) gcc, g++ in rockylinux 9 is the default, no longer have gcc-toolset-11-gcc related 3) add ubuntu 22.04 for release build
1 parent 8f9f9a2 commit 8d58988

File tree

6 files changed

+370
-2
lines changed

6 files changed

+370
-2
lines changed

‎mlir-tensorrt/.devcontainer/cuda12.9-ubuntu22.04-prebuilt/devcontainer.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"name": "cuda12.9-ubuntu22.04-prebuilt",
3+
"image": "ghcr.io/nvidia/tensorrt-incubator/mlir-tensorrt:cuda12.9-ubuntu22.04-0.1",
4+
"remoteUser": "ubuntu",
5+
"updateRemoteUserUID": true,
6+
"runArgs": [
7+
"--name",
8+
"cuda12.9-ubuntu22.04-prebuilt-${localEnv:USER:ubuntu}-${devcontainerId}",
9+
"--cap-add=SYS_PTRACE",
10+
"--security-opt",
11+
"seccomp=unconfined",
12+
"--shm-size=1g",
13+
"--ulimit",
14+
"memlock=-1",
15+
"--network=host"
16+
],
17+
"hostRequirements": {
18+
"gpu": "optional"
19+
},
20+
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces/TensorRT-Incubator,type=bind,consistency=cached",
21+
"workspaceFolder": "/workspaces/TensorRT-Incubator/mlir-tensorrt",
22+
"customizations": {
23+
"vscode": {
24+
"extensions": [
25+
"llvm-vs-code-extensions.vscode-clangd",
26+
"llvm-vs-code-extensions.vscode-mlir",
27+
"eamodio.gitlens",
28+
"ms-python.black-formatter",
29+
"ms-python.python"
30+
],
31+
"settings": {
32+
"[python]": {
33+
"editor.defaultFormatter": "ms-python.black-formatter"
34+
},
35+
"mlir.pdll_compilation_databases": [
36+
"build/pdll_compile_commands.yml"
37+
],
38+
"mlir.server_path": "build/bin/mlir-tensorrt-lsp-server",
39+
"files.exclude": {
40+
"**/.git": true,
41+
"**/.cache": true,
42+
"**/.venv*": true
43+
},
44+
"files.watcherExclude": {
45+
"**/.git/objects/**": true,
46+
"**/.git/subtree-cache/**": true,
47+
"**/.private*": true,
48+
"**/.venv*/**": true,
49+
"**/build/**": true
50+
},
51+
"search.exclude": {
52+
"**/.private*": true,
53+
"**/.venv*": true,
54+
"**/build": true
55+
},
56+
"python.analysis.include": [
57+
"integrations/python",
58+
"integrations/python/internal"
59+
],
60+
"python.analysis.typeCheckingMode": "basic",
61+
"python.analysis.extraPaths": [
62+
"build/python_packages/mlir_tensorrt_compiler",
63+
"build/python_packages/mlir_tensorrt_runtime",
64+
"build/python_packages/tools"
65+
],
66+
"python.analysis.exclude": [
67+
"**/build/**",
68+
"**/.cache.cpm/**",
69+
"**/*bazel*/**",
70+
"**/build_tools/**",
71+
"third_party"
72+
]
73+
}
74+
}
75+
},
76+
"features": {
77+
"ghcr.io/devcontainers/features/common-utils:2": {
78+
"installZsh": true,
79+
"installOhMyZsh": true,
80+
"configureZshAsDefaultShell": false,
81+
"upgradePackages": false,
82+
"username": "ubuntu",
83+
"userUid": "automatic",
84+
"userGid": "automatic"
85+
},
86+
"ghcr.io/devcontainers/features/git:1": {}
87+
}
88+
}

‎mlir-tensorrt/.devcontainer/cuda12.9-ubuntu22.04/devcontainer.json‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"name": "cuda12.9-ubuntu22.04",
3+
"build": {
4+
"context": "${localWorkspaceFolder}/build_tools/docker",
5+
"dockerfile": "${localWorkspaceFolder}/build_tools/docker/Dockerfile",
6+
"args": {
7+
"BASE_IMAGE": "nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04",
8+
"LINUX_DISTRO": "ubuntu22.04",
9+
"LLVM_VERSION": 20
10+
}
11+
},
12+
"remoteUser": "ubuntu",
13+
"updateRemoteUserUID": true,
14+
"runArgs": [
15+
"--name",
16+
"cuda12.9-ubuntu22.04-${localEnv:USER:ubuntu}-${devcontainerId}",
17+
"--cap-add=SYS_PTRACE",
18+
"--security-opt",
19+
"seccomp=unconfined",
20+
"--shm-size=1g",
21+
"--ulimit",
22+
"memlock=-1",
23+
"--network=host"
24+
],
25+
"hostRequirements": {
26+
"gpu": "optional"
27+
},
28+
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces/TensorRT-Incubator,type=bind,consistency=cached",
29+
"workspaceFolder": "/workspaces/TensorRT-Incubator/mlir-tensorrt",
30+
"customizations": {
31+
"vscode": {
32+
"extensions": [
33+
"llvm-vs-code-extensions.vscode-clangd",
34+
"llvm-vs-code-extensions.vscode-mlir",
35+
"eamodio.gitlens",
36+
"ms-python.black-formatter",
37+
"ms-python.python"
38+
],
39+
"settings": {
40+
"[python]": {
41+
"editor.defaultFormatter": "ms-python.black-formatter"
42+
},
43+
"mlir.pdll_compilation_databases": [
44+
"build/pdll_compile_commands.yml"
45+
],
46+
"mlir.server_path": "build/bin/mlir-tensorrt-lsp-server",
47+
"files.exclude": {
48+
"**/.git": true,
49+
"**/.cache": true,
50+
"**/.venv*": true
51+
},
52+
"files.watcherExclude": {
53+
"**/.git/objects/**": true,
54+
"**/.git/subtree-cache/**": true,
55+
"**/.private*": true,
56+
"**/.venv*/**": true,
57+
"**/build/**": true
58+
},
59+
"search.exclude": {
60+
"**/.private*": true,
61+
"**/.venv*": true,
62+
"**/build": true
63+
},
64+
"python.analysis.include": [
65+
"integrations/python",
66+
"integrations/python/internal"
67+
],
68+
"python.analysis.typeCheckingMode": "basic",
69+
"python.analysis.extraPaths": [
70+
"build/python_packages/mlir_tensorrt_compiler",
71+
"build/python_packages/mlir_tensorrt_runtime",
72+
"build/python_packages/tools"
73+
],
74+
"python.analysis.exclude": [
75+
"**/build/**",
76+
"**/.cache.cpm/**",
77+
"**/*bazel*/**",
78+
"**/build_tools/**",
79+
"third_party"
80+
]
81+
}
82+
}
83+
},
84+
"features": {
85+
"ghcr.io/devcontainers/features/common-utils:2": {
86+
"installZsh": true,
87+
"installOhMyZsh": true,
88+
"configureZshAsDefaultShell": false,
89+
"upgradePackages": false,
90+
"username": "ubuntu",
91+
"userUid": "automatic",
92+
"userGid": "automatic"
93+
},
94+
"ghcr.io/devcontainers/features/git:1": {}
95+
}
96+
}

‎mlir-tensorrt/.devcontainer/cuda13.0-ubuntu22.04-prebuilt/devcontainer.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"name": "cuda13.0-ubuntu22.04-prebuilt",
3+
"image": "ghcr.io/nvidia/tensorrt-incubator/mlir-tensorrt:cuda13.0-ubuntu22.04-0.1",
4+
"remoteUser": "ubuntu",
5+
"updateRemoteUserUID": true,
6+
"runArgs": [
7+
"--name",
8+
"cuda13.0-ubuntu22.04-prebuilt-${localEnv:USER:ubuntu}-${devcontainerId}",
9+
"--cap-add=SYS_PTRACE",
10+
"--security-opt",
11+
"seccomp=unconfined",
12+
"--shm-size=1g",
13+
"--ulimit",
14+
"memlock=-1",
15+
"--network=host"
16+
],
17+
"hostRequirements": {
18+
"gpu": "optional"
19+
},
20+
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces/TensorRT-Incubator,type=bind,consistency=cached",
21+
"workspaceFolder": "/workspaces/TensorRT-Incubator/mlir-tensorrt",
22+
"customizations": {
23+
"vscode": {
24+
"extensions": [
25+
"llvm-vs-code-extensions.vscode-clangd",
26+
"llvm-vs-code-extensions.vscode-mlir",
27+
"eamodio.gitlens",
28+
"ms-python.black-formatter",
29+
"ms-python.python"
30+
],
31+
"settings": {
32+
"[python]": {
33+
"editor.defaultFormatter": "ms-python.black-formatter"
34+
},
35+
"mlir.pdll_compilation_databases": [
36+
"build/pdll_compile_commands.yml"
37+
],
38+
"mlir.server_path": "build/bin/mlir-tensorrt-lsp-server",
39+
"files.exclude": {
40+
"**/.git": true,
41+
"**/.cache": true,
42+
"**/.venv*": true
43+
},
44+
"files.watcherExclude": {
45+
"**/.git/objects/**": true,
46+
"**/.git/subtree-cache/**": true,
47+
"**/.private*": true,
48+
"**/.venv*/**": true,
49+
"**/build/**": true
50+
},
51+
"search.exclude": {
52+
"**/.private*": true,
53+
"**/.venv*": true,
54+
"**/build": true
55+
},
56+
"python.analysis.include": [
57+
"integrations/python",
58+
"integrations/python/internal"
59+
],
60+
"python.analysis.typeCheckingMode": "basic",
61+
"python.analysis.extraPaths": [
62+
"build/python_packages/mlir_tensorrt_compiler",
63+
"build/python_packages/mlir_tensorrt_runtime",
64+
"build/python_packages/tools"
65+
],
66+
"python.analysis.exclude": [
67+
"**/build/**",
68+
"**/.cache.cpm/**",
69+
"**/*bazel*/**",
70+
"**/build_tools/**",
71+
"third_party"
72+
]
73+
}
74+
}
75+
},
76+
"features": {
77+
"ghcr.io/devcontainers/features/common-utils:2": {
78+
"installZsh": true,
79+
"installOhMyZsh": true,
80+
"configureZshAsDefaultShell": false,
81+
"upgradePackages": false,
82+
"username": "ubuntu",
83+
"userUid": "automatic",
84+
"userGid": "automatic"
85+
},
86+
"ghcr.io/devcontainers/features/git:1": {}
87+
}
88+
}

‎mlir-tensorrt/.devcontainer/cuda13.0-ubuntu22.04/devcontainer.json‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"name": "cuda13.0-ubuntu22.04",
3+
"build": {
4+
"context": "${localWorkspaceFolder}/build_tools/docker",
5+
"dockerfile": "${localWorkspaceFolder}/build_tools/docker/Dockerfile",
6+
"args": {
7+
"BASE_IMAGE": "nvcr.io/nvidia/cuda:13.0.2-devel-ubuntu22.04",
8+
"LINUX_DISTRO": "ubuntu22.04",
9+
"LLVM_VERSION": 20
10+
}
11+
},
12+
"remoteUser": "ubuntu",
13+
"updateRemoteUserUID": true,
14+
"runArgs": [
15+
"--name",
16+
"cuda13.0-ubuntu22.04-${localEnv:USER:ubuntu}-${devcontainerId}",
17+
"--cap-add=SYS_PTRACE",
18+
"--security-opt",
19+
"seccomp=unconfined",
20+
"--shm-size=1g",
21+
"--ulimit",
22+
"memlock=-1",
23+
"--network=host"
24+
],
25+
"hostRequirements": {
26+
"gpu": "optional"
27+
},
28+
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces/TensorRT-Incubator,type=bind,consistency=cached",
29+
"workspaceFolder": "/workspaces/TensorRT-Incubator/mlir-tensorrt",
30+
"customizations": {
31+
"vscode": {
32+
"extensions": [
33+
"llvm-vs-code-extensions.vscode-clangd",
34+
"llvm-vs-code-extensions.vscode-mlir",
35+
"eamodio.gitlens",
36+
"ms-python.black-formatter",
37+
"ms-python.python"
38+
],
39+
"settings": {
40+
"[python]": {
41+
"editor.defaultFormatter": "ms-python.black-formatter"
42+
},
43+
"mlir.pdll_compilation_databases": [
44+
"build/pdll_compile_commands.yml"
45+
],
46+
"mlir.server_path": "build/bin/mlir-tensorrt-lsp-server",
47+
"files.exclude": {
48+
"**/.git": true,
49+
"**/.cache": true,
50+
"**/.venv*": true
51+
},
52+
"files.watcherExclude": {
53+
"**/.git/objects/**": true,
54+
"**/.git/subtree-cache/**": true,
55+
"**/.private*": true,
56+
"**/.venv*/**": true,
57+
"**/build/**": true
58+
},
59+
"search.exclude": {
60+
"**/.private*": true,
61+
"**/.venv*": true,
62+
"**/build": true
63+
},
64+
"python.analysis.include": [
65+
"integrations/python",
66+
"integrations/python/internal"
67+
],
68+
"python.analysis.typeCheckingMode": "basic",
69+
"python.analysis.extraPaths": [
70+
"build/python_packages/mlir_tensorrt_compiler",
71+
"build/python_packages/mlir_tensorrt_runtime",
72+
"build/python_packages/tools"
73+
],
74+
"python.analysis.exclude": [
75+
"**/build/**",
76+
"**/.cache.cpm/**",
77+
"**/*bazel*/**",
78+
"**/build_tools/**",
79+
"third_party"
80+
]
81+
}
82+
}
83+
},
84+
"features": {
85+
"ghcr.io/devcontainers/features/common-utils:2": {
86+
"installZsh": true,
87+
"installOhMyZsh": true,
88+
"configureZshAsDefaultShell": false,
89+
"upgradePackages": false,
90+
"username": "ubuntu",
91+
"userUid": "automatic",
92+
"userGid": "automatic"
93+
},
94+
"ghcr.io/devcontainers/features/git:1": {}
95+
}
96+
}

‎mlir-tensorrt/build_tools/docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case "${LINUX_DISTRO}" in
2626
dnf install -yq python3-dnf-plugin-versionlock
2727
dnf versionlock add '*cuda*'
2828
dnf versionlock add '*cudnn*'
29-
dnf install -yq wget curl patch
29+
dnf install -yq wget patch
3030
;;
3131
*)
3232
echo "Unsupported linux distro: ${LINUX_DISTRO}"

‎mlir-tensorrt/build_tools/docker/install-toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ case "$DISTRO" in
138138
install_cmake
139139

140140
DEV_TOOLS="git git-lfs ccache unzip mold sudo"
141-
GCC_TOOLSET="gcc-toolset-11-gcc gcc-toolset-11-gcc-c++"
141+
GCC_TOOLSET="gcc gcc-c++"
142142
DEV_LIBS="zlib-devel bzip2 bzip2-devel readline-devel libsndfile"
143143
# Note: No libc++ package available in EPEL.
144144
LLVM_PACKAGES_ROCKY="clang lld lldb clang-tools-extra git-clang-format"

0 commit comments

Comments
 (0)