Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REVIEW] CMake target cleanup, formatting, linting #604

Merged
merged 25 commits into from
Nov 20, 2020
Merged

[REVIEW] CMake target cleanup, formatting, linting #604

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2a3b207
Further CMake cleanup, add formatting and linting
Oct 13, 2020
f5b2879
set up pre-commit hook for cmake-format and cmake-lint
Oct 13, 2020
aa4e344
fix cmake breakages, fix all known linting issues
Oct 13, 2020
1b38e54
pin cmake-format version
Oct 13, 2020
62f93eb
remove unused config
Oct 13, 2020
56f0b81
fix function casing
Oct 13, 2020
3dba085
more comment cleanup
Oct 13, 2020
51dd405
match clang-format settings of 100 width, 2 spaces tabs
Oct 13, 2020
02e10e5
changelog
Oct 13, 2020
8e51a74
align pre-commit and conda versions with cudf
Oct 13, 2020
ecec53b
tweak some additional formatting config, fix cmake build issues
Oct 13, 2020
676822e
further config tweak to prevent vertical layout in situations
Oct 13, 2020
7efb644
Move compile definitions down to benchmarks / tests
Oct 14, 2020
1e0cd0a
Remove 'GPU_ARCHS' and move CUDA language down to tests/benchmarks
Oct 14, 2020
8b0f765
Merge branch 'branch-0.17' into cmake_target_cleanup
Oct 15, 2020
2e09862
Merge branch 'branch-0.17' into cmake_target_cleanup
Oct 15, 2020
ee5d025
temporarily upgrade cmake via gpu ci script
Oct 16, 2020
40b8bbc
typo in conda command
Oct 16, 2020
1c4be3b
need to call 'enable_testing' in root cmake
Oct 16, 2020
4f4f537
hook up formatting and linting to CI
Nov 5, 2020
5918222
add cmake-format to style checker conda environment temporarily
Nov 5, 2020
d5fe0f6
Merge branch 'branch-0.17' into cmake_target_cleanup
Nov 5, 2020
b1a1df8
remove 'cmake-format' install from style ci script
Nov 7, 2020
da29d84
Merge branch 'branch-0.17' into cmake_target_cleanup
Nov 16, 2020
080544a
use exclude list instead of include list
Nov 18, 2020
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
Prev Previous commit
Next Next commit
Merge branch 'branch-0.17' into cmake_target_cleanup
  • Loading branch information
Keith Kraus committed Nov 16, 2020
commit da29d8442ef3fb674fe4eeba9b057ba26ec3b7dc
8 changes: 3 additions & 5 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ conda activate rapids
gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.*

# https://docs.rapids.ai/maintainers/depmgmt/
# conda remove --force rapids-build-env
# conda install "your-pkg=1.0.0"
conda remove --force rapids-build-env
conda install "cmake=3.18"
# gpuci_conda_retry remove -f rapids-build-env
# gpuci_conda_retry install "your-pkg=1.0.0"

gpuci_logger "Check versions"
python --version
Expand Down Expand Up @@ -80,7 +78,7 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
cd "${WORKSPACE}/build"
GTEST_OUTPUT="xml:${WORKSPACE}/test-results/" make -j${PARALLEL_LEVEL} test

logger "Running rmm pytests..."
gpuci_logger "Running rmm pytests..."
cd $WORKSPACE/python
py.test --cache-clear --basetemp=${WORKSPACE}/rmm-cuda-tmp --junitxml=${WORKSPACE}/test-results/junit-rmm.xml -v --cov-config=.coveragerc --cov=rmm --cov-report=xml:${WORKSPACE}/python/rmm-coverage.xml --cov-report term
fi
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.