Skip to content

Commit a34770b

Browse files
mc-nvmc-nv
authored
Set CMake version to 3.27.7 (#6675)
* Set CMake version to 3.27.7 * Set CMake version to 3.27.7 * Fix double slash typo
1 parent 8afdad2 commit a34770b

File tree

8 files changed

+58
-74
lines changed

8 files changed

+58
-74
lines changed

‎Dockerfile.QA

+7-9
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,13 @@ RUN apt-get update && \
6262
RUN pip3 install --upgrade pip && \
6363
pip3 install --upgrade wheel setuptools
6464

65-
RUN apt update && apt install -y gpg wget && \
66-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
67-
gpg --dearmor - | \
68-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
69-
. /etc/os-release && \
70-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
71-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
72-
apt-get update && \
73-
apt-get install -y --no-install-recommends cmake cmake-data
65+
RUN apt update -q=2 \
66+
&& apt install -y gpg wget \
67+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
68+
&& . /etc/os-release \
69+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
70+
&& apt-get update -q=2 \
71+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7*
7472

7573
# Add inception_graphdef model to example repo
7674
WORKDIR /workspace/docs/examples/model_repository

‎Dockerfile.sdk

+8-10
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,14 @@ RUN apt-get update && \
8787

8888
# Client build requires recent version of CMake (FetchContent required)
8989
# Using CMAKE installation instruction from:: https://apt.kitware.com/
90-
RUN apt update && apt install -y gpg wget && \
91-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
92-
gpg --dearmor - | \
93-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
94-
. /etc/os-release && \
95-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
96-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
97-
apt-get update && \
98-
apt-get install -y --no-install-recommends cmake cmake-data && \
99-
cmake --version
90+
RUN apt update -q=2 \
91+
&& apt install -y gpg wget \
92+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
93+
&& . /etc/os-release \
94+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
95+
&& apt-get update -q=2 \
96+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7* \
97+
&& cmake --version
10098

10199
# Build expects "python" executable (not python3).
102100
RUN rm -f /usr/bin/python && \

‎build.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -1039,15 +1039,13 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
10391039
mv /tmp/boost_1_80_0/boost /usr/include/boost
10401040
10411041
# Server build requires recent version of CMake (FetchContent required)
1042-
RUN apt update && apt install -y gpg wget && \
1043-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
1044-
gpg --dearmor - | \
1045-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
1046-
. /etc/os-release && \
1047-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
1048-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
1049-
apt-get update && \
1050-
apt-get install -y --no-install-recommends cmake cmake-data
1042+
RUN apt update -q=2 \\
1043+
&& apt install -y gpg wget \\
1044+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \\
1045+
&& . /etc/os-release \\
1046+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \\
1047+
&& apt-get update -q=2 \\
1048+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7*
10511049
"""
10521050

10531051
if FLAGS.enable_gpu:

‎qa/L0_backend_bls/test.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ RET=0
3838

3939
# Backend build requires recent version of CMake (FetchContent required)
4040
# Using CMAKE installation instruction from:: https://apt.kitware.com/
41-
apt update && apt install -y gpg wget && \
42-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
43-
gpg --dearmor - | \
44-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
45-
. /etc/os-release && \
46-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
47-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
48-
apt-get update && \
49-
apt-get install -y --no-install-recommends cmake cmake-data \
41+
apt update -q=2 \
42+
&& apt install -y gpg wget \
43+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
44+
&& . /etc/os-release \
45+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
46+
&& apt-get update -q=2 \
47+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7* \
5048
rapidjson-dev
5149
cmake --version
5250

‎qa/L0_backend_python/common.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,13 @@ install_conda() {
4545
install_build_deps() {
4646
apt update && apt install software-properties-common rapidjson-dev -y
4747
# Using CMAKE installation instruction from:: https://apt.kitware.com/
48-
apt install -y gpg wget && \
49-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
50-
gpg --dearmor - | \
51-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
52-
. /etc/os-release && \
53-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
54-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
55-
apt-get update && \
56-
apt-get install -y --no-install-recommends cmake cmake-data
48+
apt update -q=2 \
49+
&& apt install -y gpg wget \
50+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
51+
&& . /etc/os-release \
52+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
53+
&& apt-get update -q=2 \
54+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7*
5755
}
5856

5957
create_conda_env() {

‎qa/L0_backend_tutorial/test.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ RET=0
4141

4242
# Client build requires recent version of CMake (FetchContent required)
4343
# Using CMAKE installation instruction from:: https://apt.kitware.com/
44-
apt update && apt install -y gpg wget && \
45-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
46-
gpg --dearmor - | \
47-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
48-
. /etc/os-release && \
49-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
50-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
51-
apt-get update && \
52-
apt-get install -y --no-install-recommends cmake cmake-data \
44+
apt update -q=2 \
45+
&& apt install -y gpg wget \
46+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
47+
&& . /etc/os-release \
48+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
49+
&& apt-get update -q=2 \
50+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7* \
5351
rapidjson-dev
5452
cmake --version
5553

‎qa/L0_batch_custom/test.sh

+8-10
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@ RET=0
5959

6060
# Batch strategy build requires recent version of CMake (FetchContent required)
6161
# Using CMAKE installation instruction from:: https://apt.kitware.com/
62-
apt update && apt install -y gpg wget && \
63-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
64-
gpg --dearmor - | \
65-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
66-
. /etc/os-release && \
67-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
68-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
69-
apt-get update && \
70-
apt-get install -y --no-install-recommends cmake cmake-data rapidjson-dev
62+
apt update -q=2 \
63+
&& apt install -y gpg wget \
64+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
65+
&& . /etc/os-release \
66+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
67+
&& apt-get update -q=2 \
68+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7* rapidjson-dev
7169
cmake --version
7270

7371
# Set up repository
@@ -112,7 +110,7 @@ test_setups=("cp models/libtriton_singlebatching.so ${BACKEND_DIR}/batchstrategy
112110
"cp models/libtriton_volumebatching.so ${BACKEND_DIR}/batchstrategy.so && sed -i \"s/(12))/(4, 5, 6))/\" ${BATCH_CUSTOM_TEST}"
113111
"mv ${BACKEND_DIR}/batchstrategy.so ${MODEL_DIR} && cp models/libtriton_singlebatching.so ${BACKEND_DIR}"
114112
"mv ${MODEL_DIR}/batchstrategy.so ${VERSION_DIR}/batchstrategy.so"
115-
"mv ${VERSION_DIR}/batchstrategy.so models/${MODEL_NAME}/libtriton_volumebatching.so && echo \"parameters: {key: \\\"TRITON_BATCH_STRATEGY_PATH\\\", value: {string_value: \\\"${MODEL_DIR}/libtriton_volumebatching.so\\\"}}\" >> ${CONFIG_PATH}")
113+
"mv ${VERSION_DIR}/batchstrategy.so models/${MODEL_NAME}/libtriton_volumebatching.so && echo \"parameters: {key: \\"TRITON_BATCH_STRATEGY_PATH\\", value: {string_value: \\"${MODEL_DIR}/libtriton_volumebatching.so\\"}}\" >> ${CONFIG_PATH}")
116114

117115
for i in "${!test_setups[@]}"; do
118116
echo "Running ${test_types[$i]} test"

‎qa/L0_client_build_variants/test.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ apt-get install -y --no-install-recommends \
3232

3333
# Client build requires recent version of CMake (FetchContent required)
3434
# Using CMAKE installation instruction from:: https://apt.kitware.com/
35-
apt update && apt install -y gpg wget && \
36-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
37-
gpg --dearmor - | \
38-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
39-
. /etc/os-release && \
40-
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | \
41-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
42-
apt-get update && \
43-
apt-get install -y --no-install-recommends cmake cmake-data
35+
apt update -q=2 \
36+
&& apt install -y gpg wget \
37+
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
38+
&& . /etc/os-release \
39+
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
40+
&& apt-get update -q=2 \
41+
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7*
4442
cmake --version
4543

4644

0 commit comments

Comments
 (0)