Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Update to gcc 12 #212

Merged
merged 3 commits into from
Mar 1, 2023
Merged

Update to gcc 12 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7592302
Use apt package for GitHub Actions CUDA install
alexbaden Feb 23, 2023
c0537b7
Fixup ASAN test under gcc12 to avoid -Werror
alexbaden Feb 23, 2023
b40e5f8
Update to gcc 12
alexbaden Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ jobs:
- name: Install cudatoolkit-dev
if: env.cuda_compiler_version != 'None'
run: |
conda install -n ${{ env.CONDA_ENV }} -c conda-forge cudatoolkit-dev arrow-cpp-proc=4.0.0=cuda
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb
sudo dpkg -i cuda-keyring_1.0-1_all.deb
sudo apt-get update
sudo apt-get install cuda-nvcc-${{ env.cuda_compiler_version }}
conda install -n ${{ env.CONDA_ENV }} -c conda-forge arrow-cpp-proc=4.0.0=cuda

- name: Restore Maven cache
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
build-cuda:
uses: ./.github/workflows/build.yml
with:
cuda_compiler_version: 11
cuda_compiler_version: "12-0"

style:
needs: build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ jobs:
conda run -n ${{ env.CONDA_ENV }} ./ArrowBasedExecuteTest --build-rel-alg-cache=cache.txt

cd ../.. # rebuild with ASAN
conda run -n ${{ env.CONDA_ENV }} cmake -B ./build -S . -DENABLE_TESTS=on -DENABLE_CUDA=off -DENABLE_ASAN=on
conda run -n ${{ env.CONDA_ENV }} cmake --build ./build/ --parallel 2
conda run -n ${{ env.CONDA_ENV }} cmake -B ./build -S . -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=off -DENABLE_ASAN=on
conda run -n ${{ env.CONDA_ENV }} cmake --build ./build/ --parallel 2 -- -i

cd ..
tar -zcf /tmp/build.tgz .
Expand Down
1 change: 1 addition & 0 deletions omniscidb/scripts/conda/build-install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set -ex
[ -z "$PREFIX" ] && PREFIX=${CONDA_PREFIX:-/usr/local}
export PREFIX=$(cd "$PREFIX"; pwd -P)
export PATH=$PATH:/usr/local/cuda/bin

this_dir=$(dirname "${BASH_SOURCE[0]}")

Expand Down
4 changes: 2 additions & 2 deletions omniscidb/scripts/mapd-deps-conda-dev-env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ channels:
- conda-forge

dependencies:
- gxx_linux-64 9.*
- gcc_linux-64 9.*
- gxx_linux-64 12.*
- gcc_linux-64 12.*
- ccache
- sysroot_linux-64 >=2.14
- arrow-cpp 11.0
Expand Down