@@ -32,48 +32,6 @@ def hipBuildTest(String backendLabel) {
3232 }
3333 }
3434
35- stage(" BUILD - HIT ${ backendLabel} " ) {
36- // Running the build on clr workspace
37- dir(" ${ WORKSPACE} /clr" ) {
38- sh """ #!/usr/bin/env bash
39- set -x
40- rm -rf build
41- mkdir build
42- cd build
43- # Check if backend label contains string "amd" or backend host is a server with amd gpu
44- if [[ $backendLabel =~ amd ]]; then
45- cmake -DCLR_BUILD_HIP=ON -DHIP_CATCH_TEST=0 -DHIPCC_BIN_DIR=$HIPCC_DIR /bin -DHIP_COMMON_DIR=$HIP_DIR -DCMAKE_PREFIX_PATH="/opt/rocm/" -DCMAKE_INSTALL_PREFIX=\$ PWD/install ..
46- else
47- cmake -DCLR_BUILD_HIP=ON -DHIP_CATCH_TEST=0 -DHIP_PLATFORM=nvidia -DHIPCC_BIN_DIR=$HIPCC_DIR /bin -DHIP_COMMON_DIR=$HIP_DIR -DCMAKE_INSTALL_PREFIX=\$ PWD/install ..
48- fi
49- make -j\$ (nproc)
50- make install -j\$ (nproc)
51- if [[ $backendLabel =~ amd ]]; then
52- make build_tests -j\$ (nproc)
53- else
54- HIP_COMPILER=nvcc HIP_PLATFORM=nvidia make build_tests -j\$ (nproc)
55- fi
56- """
57- }
58- }
59-
60- timeout(time : 1 , unit : ' HOURS' ) {
61- stage(" TEST - HIT ${ backendLabel} " ) {
62- dir(" ${ WORKSPACE} /clr/build/hipamd" ) {
63- sh """ #!/usr/bin/env bash
64- set -x
65- # Check if backend label contains string "amd" or backend host is a server with amd gpu
66- if [[ $backendLabel =~ amd ]]; then
67- sleep 120
68- LLVM_PATH=/opt/rocm/llvm ctest --overwrite BuildDirectory=. --output-junit hiptest_output_hit_amd.xml -E 'cooperative_streams_least_capacity.tst|cooperative_streams_half_capacity.tst|cooperative_streams_full_capacity.tst|grid_group_data_sharing.tst|hipIpcMemAccessTest.tst|p2p_copy_coherency.tst'
69- else
70- ctest --overwrite BuildDirectory=. --output-junit hiptest_output_hit_nvidia.xml
71- fi
72- """
73- }
74- }
75- }
76-
7735 stage(" BUILD HIP - ${ backendLabel} " ) {
7836 // Running the build on clr workspace
7937 dir(" ${ WORKSPACE} /clr" ) {
@@ -93,6 +51,7 @@ def hipBuildTest(String backendLabel) {
9351 """
9452 }
9553 }
54+
9655 stage(" BUILD HIP TESTS - ${ backendLabel} " ) {
9756 // Running the build on HIP TESTS workspace
9857 dir(" ${ WORKSPACE} /hip-tests" ) {
@@ -105,18 +64,18 @@ def hipBuildTest(String backendLabel) {
10564 echo "testing $HIP_PATH "
10665 # Check if backend label contains string "amd" or backend host is a server with amd gpu
10766 if [[ $backendLabel =~ amd ]]; then
108- cmake -DHIP_PLATFORM=amd ../catch
67+ cmake -DHIP_PLATFORM=amd -DHIP_PATH= \$ CLR_DIR/build/install ../catch
10968 else
11069 export HIP_PLATFORM=nvidia
111- cmake -DHIP_PLATFORM=nvidia ../catch
70+ cmake -DHIP_PLATFORM=nvidia -DHIP_PATH= \$ CLR_DIR/build/install ../catch
11271 fi
11372 make -j\$ (nproc) build_tests
11473 """
11574 }
11675 }
11776
11877 timeout(time : 1 , unit : ' HOURS' ) {
119- stage(" TEST - CATCH2 ${ backendLabel} " ) {
78+ stage(" TEST - ${ backendLabel} " ) {
12079 dir(" ${ WORKSPACE} /hip-tests" ) {
12180 sh """ #!/usr/bin/env bash
12281 set -x
@@ -138,7 +97,7 @@ timestamps {
13897 skipDefaultCheckout()
13998
14099 // labels belonging to each backend - AMD, NVIDIA
141- String [] labels = [' hip-amd-vg20-ubu1804 ' , ' hip-nvidia-rtx5000-ubu1804 ' ]
100+ String [] labels = [' hip-amd-mi100-ubu2004 ' , ' hip-nvidia-rtx5000-ubu2004 ' ]
142101 buildMap = [:]
143102
144103 labels. each { backendLabel ->
0 commit comments