Skip to content

Commit 3462f7c

Browse files
Roman Grundkiewiczemjotde
authored andcommitted
Merged PR 38664: Update CMake minimum required versions for CMake 4.0 in submodules
* Increased minimum required CMake version in submodules to fix CMake 4.0 compatibility issues * Updated library install build in CI to use CMake 4.0
1 parent 47a1fed commit 3462f7c

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
4242
- New experimental layer framework for Transformer-like models.
4343

4444
### Fixed
45-
- Use std::runtime_error to catch more types of mmap errors
45+
- Fixed compilation issues with CMake 4.0
46+
- Use `std::runtime_error` to catch more types of mmap errors
4647
- Do not use shortlist-mapped values to check for force-decoding criterion
4748
- Collapsing beam in force-decoding for beam > 1 and LSH
4849
- Various small fixes for ARM compilation

azure-pipelines.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,15 +501,27 @@ stages:
501501
sudo apt-get install -y --no-install-recommends intel-mkl-64bit-2020.0-088
502502
displayName: Install MKL
503503
504-
- bash: /usr/bin/gcc-9 --version
505-
displayName: Print GCC version
504+
# Install newest version of CMake
505+
- bash: |
506+
set -v
507+
wget https://github.com/Kitware/CMake/releases/download/v4.0.2/cmake-4.0.2-linux-x86_64.tar.gz
508+
tar zxvf cmake-4.0.2-linux-x86_64.tar.gz
509+
./cmake-4.0.2-linux-x86_64/bin/cmake --version
510+
displayName: Install CMake 4.0
506511
507512
- bash: |
508513
mkdir -p install
509514
mkdir -p build
510515
cd build
516+
set -v
517+
# compare the system-installed CMake version with the newer version
518+
cmake --version
519+
../cmake-4.0.2-linux-x86_64/bin/cmake --version
520+
# check GCC exact version
521+
/usr/bin/gcc-9 --version
522+
# run cmake
511523
CC=/usr/bin/gcc-9 CXX=/usr/bin/g++-9 \
512-
cmake .. \
524+
../cmake-4.0.2-linux-x86_64/bin/cmake .. \
513525
-DCMAKE_INSTALL_PREFIX=../install \
514526
-DCMAKE_BUILD_TYPE=slim \
515527
-DCOMPILE_LIBRARY_ONLY=on \
@@ -519,7 +531,6 @@ stages:
519531
-DUSE_SENTENCEPIECE=on \
520532
-DPYMARIAN=on \
521533
-DPYTHON_EXECUTABLE=python3
522-
523534
displayName: Configure CMake
524535
525536
- bash: make -j3 install

src/3rd_party/fbgemm

src/3rd_party/sentencepiece

0 commit comments

Comments
 (0)