Skip to content

Commit

Permalink
Merge branch '722-benchmark-tag' into 'master'
Browse files Browse the repository at this point in the history
Resolve "benchmark tag の変更"

Closes #722

See merge request ricos/monolish!489
  • Loading branch information
fockl committed May 3, 2023
2 parents 47b5aaa + 82415ff commit eb7e4be
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 25 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Unreleased

### Changed
- Change operator[] as val.get()[] of value array <https://gitlab.ritc.jp/ricos/monolish/-/merge_requests/494> <https://github.com/ricosjp/monolish/issues/726>
- Change benchmark runner <https://gitlab.ritc.jp/ricos/monolish/-/merge_requests/489> <https://github.com/ricosjp/monolish/issues/722>


0.17.1 - 2023/04/23
Expand Down
14 changes: 1 addition & 13 deletions ci/benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
#
# benchmark
#
.intel_runner:
tags:
- 008cfa52494d
.amd_runner:
tags:
- b42e99ecbde2
.gpu_runner:
tags:
- c8cbb8c6304d

.benchmark:
stage: benchmark
artifacts:
Expand All @@ -21,6 +8,7 @@
- schedules
- tags
before_script:
- apt update
- apt install -y ./$(find . -name "*.deb")

gpu_avx_mkl_benchmark:
Expand Down
19 changes: 17 additions & 2 deletions ci/env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
variables:
PRESET: "gpu-avx-none"
TEST_TARGET: "gpu"
MONOLISH_NVIDIA_GPU_ARCH: "sm_61"
MONOLISH_NVIDIA_GPU_ARCH: "sm_86"

.gpu_none:
variables:
PRESET: "gpu-none-none"
TEST_TARGET: "gpu"
MONOLISH_NVIDIA_GPU_ARCH: "sm_61"
MONOLISH_NVIDIA_GPU_ARCH: "sm_86"

.cpu_avx:
variables:
Expand All @@ -50,3 +50,18 @@
TEST_TARGET: "cpu"
CC: "/usr/bin/gcc"
CXX: "/usr/bin/g++"

#
# benchmark
#
.intel_runner:
tags:
- 008cfa524ffc
.amd_runner:
tags:
- 04421a0d68d7
.gpu_runner:
tags:
- 04421a0d68db


8 changes: 4 additions & 4 deletions ci/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gpu_avx_mkl_examples:
- "gpu_avx_mkl_build"
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

gpu_none_mkl_examples:
extends:
Expand All @@ -32,7 +32,7 @@ gpu_none_mkl_examples:
needs:
- "gpu_none_mkl_build"
tags:
- nvidia0-sm_61
- nvidia0-sm_86

gpu_avx_oss_examples:
extends:
Expand All @@ -43,7 +43,7 @@ gpu_avx_oss_examples:
- "gpu_avx_oss_build"
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

gpu_none_oss_examples:
extends:
Expand All @@ -53,7 +53,7 @@ gpu_none_oss_examples:
needs:
- "gpu_none_oss_build"
tags:
- nvidia0-sm_61
- nvidia0-sm_86

cpu_avx_gcc_mkl_examples:
extends:
Expand Down
12 changes: 6 additions & 6 deletions ci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ gpu_deb_test:
- gpu_avx_oss_build
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

both_deb_test:
image: nvidia/cuda:11.7.0-devel-ubuntu22.04
Expand All @@ -69,7 +69,7 @@ both_deb_test:
- gpu_avx_oss_build
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

gpu_avx_mkl:
extends:
Expand All @@ -80,7 +80,7 @@ gpu_avx_mkl:
- "gpu_avx_mkl_build"
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

gpu_none_mkl:
extends:
Expand All @@ -90,7 +90,7 @@ gpu_none_mkl:
needs:
- "gpu_none_mkl_build"
tags:
- nvidia0-sm_61
- nvidia0-sm_86

gpu_avx_oss:
extends:
Expand All @@ -101,7 +101,7 @@ gpu_avx_oss:
- "gpu_avx_oss_build"
tags:
- avx
- nvidia0-sm_61
- nvidia0-sm_86

gpu_none_oss:
extends:
Expand All @@ -111,7 +111,7 @@ gpu_none_oss:
needs:
- "gpu_none_oss_build"
tags:
- nvidia0-sm_61
- nvidia0-sm_86

cpu_avx_gcc_mkl:
extends:
Expand Down

0 comments on commit eb7e4be

Please sign in to comment.