Fix static builds (#393)

.jenkins/staticlibrary.groovy

@@ -9,7 +9,7 @@ def runCI =
     nodeDetails, jobName->
     
     def prj = new rocProject('rccl', 'Static Library PreCheckin')
-    prj.paths.build_command = './install.sh --static'
+    prj.paths.build_command = './install.sh -t --static'
     
 
     def nodes = new dockerNodes(nodeDetails, jobName, prj)
@@ -31,17 +31,17 @@ def runCI =
     {
         platform, project->
 
-        commonGroovy.runTestCommand(platform, project)
+        commonGroovy.runTestCommand(platform, project, "*sum_float32*")
     }
 
     def packageCommand =
     {
         platform, project->
 
-        commonGroovy.runPackageCommand(platform, project)
+        commonGroovy.runPackageCommand(platform, project, jobName)
     }
 
-    buildProject(prj, formatCheck, nodes.dockerArray, compileCommand, null, null)
+    buildProject(prj, formatCheck, nodes.dockerArray, compileCommand, testCommand, packageCommand)
 }
 
 ci: { 

CMakeLists.txt

@@ -203,13 +203,13 @@ if(COLLTRACE)
 endif()
 
 foreach(target ${AMDGPU_TARGETS})
-target_link_libraries(rccl PRIVATE --cuda-gpu-arch=${target})
+  target_link_libraries(rccl PRIVATE --amdgpu-target=${target})
 endforeach()
 
 if("${HIP_COMPILER}" MATCHES "clang")
   target_compile_options(rccl PRIVATE -fvisibility=hidden)
   foreach(target ${AMDGPU_TARGETS})
-    target_compile_options(rccl PRIVATE --cuda-gpu-arch=${target} PRIVATE -fgpu-rdc)
+    target_compile_options(rccl PRIVATE -fgpu-rdc)
   endforeach()
   target_link_libraries(rccl PRIVATE -fgpu-rdc)
   target_include_directories(rccl PRIVATE ${ROCM_PATH}/hsa/include)

test/CMakeLists.txt

@@ -42,20 +42,20 @@ if(BUILD_TESTS)
   add_executable(UnitTests ${TEST_SOURCES_SINGLE_PROCESS})
   target_include_directories(UnitTests PRIVATE ${ROCM_PATH} ${GTEST_INCLUDE_DIRS})
   target_link_libraries(UnitTests PRIVATE ${GTEST_BOTH_LIBRARIES})
+  target_link_libraries(UnitTests PRIVATE hip::host hip::device)
 
   add_executable(UnitTestsMultiProcess ${TEST_SOURCES_MULTI_PROCESS})
   target_include_directories(UnitTestsMultiProcess PRIVATE ${ROCM_PATH} ${GTEST_INCLUDE_DIRS})
   target_link_libraries(UnitTestsMultiProcess PRIVATE ${GTEST_BOTH_LIBRARIES})
+  target_link_libraries(UnitTestsMultiProcess PRIVATE hip::host hip::device)
 
   # UnitTests using static library of rccl requires passing rccl
   # through -l and -L instead of command line input.
   if(BUILD_STATIC)
     add_dependencies(UnitTests rccl)
     target_link_libraries(UnitTests PRIVATE dl rt numa -lrccl -L${CMAKE_BINARY_DIR})
-    target_link_libraries(UnitTests PRIVATE amdhip64 amd_comgr hsa-runtime64::hsa-runtime64)
     add_dependencies(UnitTestsMultiProcess rccl)
     target_link_libraries(UnitTestsMultiProcess PRIVATE dl rt numa -lrccl -L${CMAKE_BINARY_DIR})
-    target_link_libraries(UnitTestsMultiProcess PRIVATE amdhip64 amd_comgr hsa-runtime64::hsa-runtime64)
   else()
     target_link_libraries(UnitTests PRIVATE rccl)
     target_link_libraries(UnitTestsMultiProcess PRIVATE rt rccl)