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

Require benchmark 1.5.4, update nightly containers to Ubuntu 22.04 #799

Merged
merged 5 commits into from
Dec 28, 2022
Merged

Require benchmark 1.5.4, update nightly containers to Ubuntu 22.04 #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e44b105
Require Google benchmark 1.5.4
aprokop Dec 26, 2022
e148d78
Switch google benchmark rates to use 1.5 rate feature
aprokop Dec 26, 2022
f22594a
Update gitlab-ci.yml to install benchmark 1.6.0
aprokop Dec 26, 2022
6cb3c70
Upgrade SYCL container's benchmark to 1.5.4
aprokop Dec 27, 2022
9f1deb6
[ci skip] Update nightly containers to Ubuntu 22.04
aprokop Dec 27, 2022
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
extends: .LoadModules
stage: buildDependencies
script:
- git clone https://github.com/google/benchmark.git -b v1.4.1 &&
- git clone https://github.com/google/benchmark.git -b v1.6.0 &&
cd benchmark &&
git clone https://github.com/google/googletest.git -b release-1.8.1 &&
aprokop marked this conversation as resolved.
Show resolved Hide resolved
mkdir build && cd build &&
Expand Down
8 changes: 4 additions & 4 deletions .jenkins/nightly.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ pipeline {

stage('Build') {
parallel {
stage('CUDA-11.4.2') {
stage('CUDA-11.7.1') {
agent {
docker {
image 'nvidia/cuda:11.4.2-devel-ubuntu20.04'
image 'nvidia/cuda:11.7.1-devel-ubuntu22.04'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 11.7.1?
For the record, looking at docker hub https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=ubuntu22, we can chose from [11.7.0, 11.7.1, 11.8.0, 12.0.0]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, out of those versions, I wanted the earlierst, but thought that maybe 11.7.1 fixed some bugs in 11.7.0.

label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
}
Expand Down Expand Up @@ -47,10 +47,10 @@ pipeline {
}
}
}
stage('ROCm-5.2') {
stage('ROCm-5.4') {
agent {
docker {
image 'rocm/dev-ubuntu-20.04:5.2-complete'
image 'rocm/dev-ubuntu-22.04:5.4-complete'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. For the record we have to chose from [5.3, 5.4]

label 'AMD_Radeon_Instinct_MI100 && rocm-docker'
args '--device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=${HIP_VISIBLE_DEVICES}'
}
Expand Down
5 changes: 2 additions & 3 deletions benchmarks/bvh_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
set(POINT_CLOUDS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
set(UNIT_TESTS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/test)

# We require version 1.4.0 or higher but the format used by Google benchmark is
# wrong and thus, we cannot check the version during the configuration step.
find_package(benchmark REQUIRED)
find_package(benchmark 1.5.4 REQUIRED)
message(STATUS "Found benchmark: ${benchmark_DIR} (version \"${benchmark_VERSION}\")")

find_package(Threads REQUIRED)

Expand Down
14 changes: 5 additions & 9 deletions benchmarks/bvh_driver/benchmark_registration.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,8 @@ void BM_construction(benchmark::State &state, Spec const &spec)
std::chrono::duration<double> elapsed_seconds = end - start;
state.SetIterationTime(elapsed_seconds.count());
}
// In Benchmark 1.5.0, it could be rewritten as
// state.counters["rate"] = benchmark::Counter(
// spec.n_values, benchmark::Counter::kIsIterationInvariantRate);
// Benchmark 1.4 does not support kIsIterationInvariantRate, however.
state.counters["rate"] = benchmark::Counter(
spec.n_values * state.iterations(), benchmark::Counter::kIsRate);
spec.n_values, benchmark::Counter::kIsIterationInvariantRate);
}

template <typename ExecutionSpace, class TreeType>
Expand Down Expand Up @@ -260,7 +256,7 @@ void BM_radius_search(benchmark::State &state, Spec const &spec)
state.SetIterationTime(elapsed_seconds.count());
}
state.counters["rate"] = benchmark::Counter(
spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
spec.n_queries, benchmark::Counter::kIsIterationInvariantRate);
}

template <typename ExecutionSpace, class TreeType>
Expand Down Expand Up @@ -298,7 +294,7 @@ void BM_radius_callback_search(benchmark::State &state, Spec const &spec)
state.SetIterationTime(elapsed_seconds.count());
}
state.counters["rate"] = benchmark::Counter(
spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
spec.n_queries, benchmark::Counter::kIsIterationInvariantRate);
}

template <typename ExecutionSpace, class TreeType>
Expand Down Expand Up @@ -333,7 +329,7 @@ void BM_knn_search(benchmark::State &state, Spec const &spec)
state.SetIterationTime(elapsed_seconds.count());
}
state.counters["rate"] = benchmark::Counter(
spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
spec.n_queries, benchmark::Counter::kIsIterationInvariantRate);
}

template <typename ExecutionSpace, class TreeType>
Expand Down Expand Up @@ -370,7 +366,7 @@ void BM_knn_callback_search(benchmark::State &state, Spec const &spec)
state.SetIterationTime(elapsed_seconds.count());
}
state.counters["rate"] = benchmark::Counter(
spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
spec.n_queries, benchmark::Counter::kIsIterationInvariantRate);
}

template <typename ExecutionSpace, typename TreeType>
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sycl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN BOOST_VERSION=1.72.0 && \
# Install Google Benchmark support library
ENV BENCHMARK_DIR=/opt/benchmark
RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
git clone https://github.com/google/benchmark.git -b v1.5.0 && \
git clone https://github.com/google/benchmark.git -b v1.5.4 && \
cd benchmark && \
mkdir build && cd build && \
cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
Expand Down