Skip to content

Commit 1fa4c2e

Browse files
committed
use David's open PR branch for TPC map merging
1 parent 700bb25 commit 1fa4c2e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

o2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: O2
22
version: "%(tag_basename)s"
3-
tag: "daily-20260312-0000"
3+
tag: "dev_pull_request6"
44
requires:
55
- abseil
66
- arrow
@@ -42,7 +42,7 @@ build_requires:
4242
- googlebenchmark
4343
- O2-customization
4444
- Clang:(?!osx*)
45-
source: https://github.com/AliceO2Group/AliceO2
45+
source: https://github.com/davidrohr/AliceO2
4646
env:
4747
VMCWORKDIR: "$O2_ROOT/share"
4848
prepend_path:

resources/FindO2GPU.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# or submit itself to any jurisdiction.
1111

1212
# NOTE!!!! - Whenever this file is changed, move it over to alidist/resources
13-
# FindO2GPU.cmake Version 14
13+
# FindO2GPU.cmake Version 13
1414

1515
set(CUDA_COMPUTETARGET_DEFAULT_FULL 80-real 86-real 89-real 120-real 75-virtual)
1616
set(HIP_AMDGPUTARGET_DEFAULT_FULL gfx906;gfx908)
@@ -66,7 +66,7 @@ function(detect_gpu_arch backend) # Detect GPU architecture, optionally filterri
6666
set(CUDA_TARGET TESLA)
6767
endif()
6868

69-
string(REGEX MATCH "^[ \t\r\n]*gfx[0-9a-fA-F]+" HIP_FIRST_TARGET "${HIP_AMDGPUTARGET}")
69+
string(REGEX MATCH "^[ \t\r\n]*gfx[0-9]+" HIP_FIRST_TARGET "${HIP_AMDGPUTARGET}")
7070
string(STRIP "${HIP_FIRST_TARGET}" HIP_FIRST_TARGET)
7171
string(REGEX REPLACE "^gfx" "" HIP_FIRST_TARGET "${HIP_FIRST_TARGET}")
7272
if(NOT HIP_FIRST_TARGET)

0 commit comments

Comments
 (0)