Skip to content

Commit 4357525

Browse files
authored
upgrade vcpkg after switch to manylinux_2_28 (#437)
1 parent c85747f commit 4357525

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

.github/workflows/package_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Install the package and run pytest
8383
timeout-minutes: 10
8484
run: |
85-
docker pull pytorch/manylinux-builder:cuda${CUDA_VERSION}
85+
docker pull pytorch/manylinux2_28-builder:cuda${CUDA_VERSION}
8686
docker run --rm -t --gpus=all \
8787
-v "$CI_CACHE_DIR":/ci_cache \
8888
-v "$GITHUB_WORKSPACE":/ScaleLLM \
@@ -91,5 +91,5 @@ jobs:
9191
-e TORCH_VERSION=${TORCH_VERSION} \
9292
-e PIP_CACHE_DIR=/ci_cache/.pip \
9393
-u $(id -u):$(id -g) \
94-
pytorch/manylinux-builder:cuda${CUDA_VERSION} \
94+
pytorch/manylinux2_28-builder:cuda${CUDA_VERSION} \
9595
bash /ScaleLLM/scripts/run_pytest.sh

.github/workflows/release_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Install the package and run pytest
6464
timeout-minutes: 10
6565
run: |
66-
docker pull pytorch/manylinux-builder:cuda${CUDA_VERSION}
66+
docker pull pytorch/manylinux2_28-builder:cuda${CUDA_VERSION}
6767
docker run --rm -t --gpus=all \
6868
-v "$CI_CACHE_DIR":/ci_cache \
6969
-v "$GITHUB_WORKSPACE":/ScaleLLM \
@@ -72,5 +72,5 @@ jobs:
7272
-e TORCH_VERSION=${TORCH_VERSION} \
7373
-e PIP_CACHE_DIR=/ci_cache/.pip \
7474
-u $(id -u):$(id -g) \
75-
pytorch/manylinux-builder:cuda${CUDA_VERSION} \
75+
pytorch/manylinux2_28-builder:cuda${CUDA_VERSION} \
7676
bash /ScaleLLM/scripts/run_pytest.sh

CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ endfunction()
3535
# Set default build type
3636
if(NOT CMAKE_BUILD_TYPE)
3737
message(STATUS "Build type not set - defaulting to Release")
38-
set(CMAKE_BUILD_TYPE "Release"
39-
CACHE STRING "Choose the type of build from: Debug Release RelWithDebInfo MinSizeRel Coverage."
38+
set(CMAKE_BUILD_TYPE "Release"
39+
CACHE STRING "Choose the type of build from: Debug Release RelWithDebInfo MinSizeRel Coverage."
4040
FORCE
4141
)
4242
endif()
@@ -103,7 +103,7 @@ else()
103103

104104
FetchContent_Declare(vcpkg
105105
GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git"
106-
GIT_TAG "2024.02.14"
106+
GIT_TAG "2025.04.09"
107107
SOURCE_DIR ${VCPKG_SOURCE_DIR}
108108
)
109109
FetchContent_MakeAvailable(vcpkg)
@@ -193,12 +193,12 @@ else()
193193
set(LIBTORCH_SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/libtorch-src)
194194
endif()
195195

196-
FetchContent_Declare(libtorch
197-
URL ${LIBTORCH_URL}
196+
FetchContent_Declare(libtorch
197+
URL ${LIBTORCH_URL}
198198
SOURCE_DIR ${LIBTORCH_SOURCE_DIR}
199199
)
200200
FetchContent_MakeAvailable(libtorch)
201-
201+
202202
find_package(Torch REQUIRED PATHS ${libtorch_SOURCE_DIR} NO_DEFAULT_PATH)
203203
message(STATUS "Downloading and using libtorch 2.7.0 for cuda ${CUDA_VERSION} at ${libtorch_SOURCE_DIR}")
204204
endif()

docker/Dockerfile.manylinux2_28

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ ENV LC_ALL=en_US.UTF-8
88
ENV LANG=en_US.UTF-8
99
ENV LANGUAGE=en_US.UTF-8
1010

11+
# Install dependencies
12+
RUN yum install -y \
13+
libtool \
14+
&& yum clean all
15+
1116
# Show versions of gcc, g++, nvcc
1217
RUN gcc --version; g++ --version; nvcc --version
1318

vcpkg.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,75 @@
44
"dependencies": [
55
{
66
"name": "fmt",
7-
"version>=": "10.1.1",
7+
"version>=": "11.0.2#1",
88
"default-features": false
99
},
1010
{
1111
"name": "abseil",
12-
"version>=": "20230125.3"
12+
"version>=": "20250127.0"
1313
},
1414
{
1515
"name": "boost-asio",
16-
"version>=": "1.84.0"
16+
"version>=": "1.87.0"
1717
},
1818
{
1919
"name": "boost-algorithm",
20-
"version>=": "1.84.0"
20+
"version>=": "1.87.0"
2121
},
2222
{
2323
"name": "boost-beast",
24-
"version>=": "1.84.0"
24+
"version>=": "1.87.0"
2525
},
2626
{
2727
"name": "benchmark",
28-
"version>=": "1.8.0"
28+
"version>=": "1.9.2"
2929
},
3030
{
3131
"name": "protobuf",
32-
"version>=": "3.21.12"
32+
"version>=": "5.29.3"
3333
},
3434
{
3535
"name": "folly",
36-
"version>=": "2024.01.01.00",
36+
"version>=": "2025.03.31.00#1",
3737
"default-features": false
3838
},
3939
{
4040
"name": "gflags",
41-
"version>=": "2.2.2#7"
41+
"version>=": "2.2.2#9"
4242
},
4343
{
4444
"name": "gtest",
45-
"version>=": "1.13.0"
45+
"version>=": "1.16.0#1"
4646
},
4747
{
4848
"name": "glog",
49-
"version>=": "0.6.0#2"
49+
"version>=": "0.7.1"
5050
},
5151
{
5252
"name": "grpc",
53-
"version>=": "1.51.1",
53+
"version>=": "1.71.0",
5454
"default-features": false
5555
},
5656
{
5757
"name": "prometheus-cpp",
58-
"version>=": "1.1.0",
58+
"version>=": "1.3.0",
5959
"default-features": false
6060
},
6161
{
6262
"name": "nlohmann-json",
63-
"version>=": "3.11.2",
63+
"version>=": "3.11.3#1",
6464
"default-features": false
6565
},
6666
{
6767
"name": "rapidjson",
68-
"version>=": "2023-07-17",
68+
"version>=": "2025-02-26",
6969
"default-features": false
7070
},
7171
{
7272
"name": "re2",
73-
"version>=": "2023-07-01",
73+
"version>=": "2024-07-02",
7474
"default-features": false
7575
}
7676
],
77-
"builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af"
77+
"builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b"
7878
}

0 commit comments

Comments
 (0)