Skip to content

Commit

Permalink
Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewdouglas committed Mar 7, 2024
2 parents b47aa28 + 72c5d97 commit b2ff607
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,14 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: pip
- name: Upgrade CMake
- name: Install recent CMake and adjust PATH accordingly
# (needed due to old nvidia/cuda:*ubuntu20.04 being consciously used for many_linux compatibility)
run: |
pip install -q cmake==3.28.3
CMAKE_BIN_PATH=$(pip show cmake | grep Location | cut -d' ' -f2)/bin
echo "CMAKE_BIN_PATH=$CMAKE_BIN_PATH" >> $GITHUB_ENV
echo "PATH=$CMAKE_BIN_PATH:$PATH" >> $GITHUB_ENV
which cmake
- name: Install build package
shell: bash
run: pip install build
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ cmake_minimum_required(VERSION 3.22.1)

project(bitsandbytes LANGUAGES CXX)

message(STATUS "CMAKE_VERSION ${CMAKE_VERSION}")

# If run without specifying a build type, default to using the Release configuration:
# optimizing the generated binaries for performance and also adds the `-DNDEBUG` flag,
# which turns off a bunch of asserts which seem to link to new symbols in libstdc++,
# worsening our many_linux compliance..
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()
Expand Down

0 comments on commit b2ff607

Please sign in to comment.