[CI][hipCUB] Updated dependency branch parameters to CI jobs to be more consistent with rocThrust

.jenkins/common.groovy

@@ -11,11 +11,19 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s
     //Set CI node's gfx arch as target if PR, otherwise use default targets of the library
     String amdgpuTargets = env.BRANCH_NAME.startsWith('PR-') ? '-DAMDGPU_TARGETS=\$gfx_arch' : ''
 
-    def getRocPRIM = auxiliary.getLibrary('rocPRIM', platform.jenkinsLabel, null, sameOrg)
+    def getDependenciesCommand = ""
+    if (project.installLibraryDependenciesFromCI)
+    {
+        project.libraryDependencies.each
+        {
+            libraryName ->
+            getDependenciesCommand += auxiliary.getLibrary(libraryName, platform.jenkinsLabel, 'develop', sameOrg)
+        }
+    }
 
     def command = """#!/usr/bin/env bash
                 set -x
-                ${getRocPRIM}
+                ${getDependenciesCommand}
                 cd ${project.paths.project_build_prefix}
                 mkdir -p build/${buildTypeDir} && cd build/${buildTypeDir}
                 ${auxiliary.gfxTargetParser()}

.jenkins/precheckin.groovy

@@ -15,6 +15,7 @@ def runCI =
 
     def prj = new rocProject('hipCUB', 'PreCheckin')
     prj.timeout.compile = 400
+    prj.libraryDependencies = ["rocPRIM"]
     // Define test architectures, optional rocm version argument is available
     def nodes = new dockerNodes(nodeDetails, jobName, prj)
 

.jenkins/staticlibrary.groovy

@@ -10,6 +10,9 @@ def runCI =
 
     def prj = new rocProject('hipCUB', 'Static Library PreCheckin')
 
+    prj.libraryDependencies = ["rocPRIM"]
+    prj.timeout.compile = 500
+
     def nodes = new dockerNodes(nodeDetails, jobName, prj)
 
     def commonGroovy
@@ -55,6 +58,7 @@ ci: {
                        "rocm-docker":([ubuntu16:['gfx900'],centos7:['gfx906'],sles15sp1:['gfx908']])]
     jobNameList = auxiliary.appendJobNameList(jobNameList)
 
+    auxiliary.registerDependencyBranchParameter(["rocPRIM"])
     propertyList.each 
     {
         jobName, property->

CHANGELOG.md

@@ -14,6 +14,7 @@ Full documentation for hipCUB is available at [https://rocm.docs.amd.com/project
 * Added `DeviceSelect::FlaggedIf` and its inplace overload.
 
 ### Changed
+* Removed usage of `std::unary_function` and `std::binary_function` in `test_hipcub_device_adjacent_difference.cpp`
 * Changed the subset of tests that are run for smoke tests such that the smoke test will complete with faster run-time and to never exceed 2GB of vram usage. Use `python rtest.py [--emulation|-e|--test|-t]=smoke` to run these tests.
 * The `rtest.py` options have changed. `rtest.py` is now run with at least either `--test|-t` or `--emulation|-e`, but not both options.
 * The NVIDIA backend now requires CUB, Thrust and libcu++ 2.5.0. If it is not found it will be downloaded from the NVIDIA CCCL repository.

hipcub/include/hipcub/backend/rocprim/hipcub.hpp

@@ -51,6 +51,7 @@
 
 // Device
 #include "device/device_adjacent_difference.hpp"
+#include "device/device_copy.hpp"
 #include "device/device_histogram.hpp"
 #include "device/device_memcpy.hpp"
 #include "device/device_merge_sort.hpp"

test/hipcub/test_hipcub_device_adjacent_difference.cpp

@@ -315,7 +315,7 @@ inline auto make_transform_iterator(InputIterator iterator, UnaryFunction transf
 }
 
 template<class T>
-struct conversion_op : public std::unary_function<T, discard_write<T>>
+struct conversion_op
 {
     HIPCUB_HOST_DEVICE
     auto operator()(const T i) const
@@ -325,7 +325,7 @@ struct conversion_op : public std::unary_function<T, discard_write<T>>
 };
 
 template<class T>
-struct flag_expected_op : public std::binary_function<T, T, discard_write<T>>
+struct flag_expected_op
 {
     bool left;
     T    expected;