From b27f35e270dfc19cd89e8de6f0009c678e18f22c Mon Sep 17 00:00:00 2001 From: Hui Liu <96135754+hliuca@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:31:14 -0700 Subject: [PATCH] rm hip from src --- cmake/Utils.cmake | 1 - src/CMakeLists.txt | 3 ++- src/c_api/c_api.hip | 4 ---- src/collective/coll.hip | 4 ---- src/collective/comm.hip | 4 ---- src/collective/communicator.hip | 4 ---- src/collective/nccl_device_communicator.hip | 4 ---- src/common/common.hip | 4 ---- src/common/hist_util.hip | 4 ---- src/common/host_device_vector.hip | 4 ---- src/common/numeric.hip | 4 ---- src/common/quantile.hip | 4 ---- src/common/random.hip | 4 ---- src/common/ranking_utils.hip | 4 ---- src/common/stats.hip | 4 ---- src/context.hip | 4 ---- src/data/array_interface.hip | 4 ---- src/data/data.hip | 4 ---- src/data/ellpack_page.hip | 4 ---- src/data/ellpack_page_raw_format.hip | 4 ---- src/data/ellpack_page_source.hip | 4 ---- src/data/gradient_index.hip | 4 ---- src/data/iterative_dmatrix.hip | 4 ---- src/data/proxy_dmatrix.hip | 4 ---- src/data/simple_dmatrix.hip | 4 ---- src/data/sparse_page_dmatrix.hip | 4 ---- src/data/sparse_page_source.hip | 4 ---- src/gbm/gbtree.hip | 4 ---- src/linear/updater_gpu_coordinate.hip | 4 ---- src/metric/auc.hip | 4 ---- src/metric/elementwise_metric.hip | 4 ---- src/metric/multiclass_metric.hip | 4 ---- src/metric/rank_metric.hip | 5 ----- src/metric/survival_metric.hip | 4 ---- src/objective/adaptive.hip | 4 ---- src/objective/aft_obj.hip | 4 ---- src/objective/hinge.hip | 4 ---- src/objective/lambdarank_obj.hip | 4 ---- src/objective/multiclass_obj.hip | 4 ---- src/objective/quantile_obj.hip | 4 ---- src/objective/regression_obj.hip | 4 ---- src/predictor/gpu_predictor.hip | 4 ---- src/tree/constraints.hip | 4 ---- src/tree/fit_stump.hip | 4 ---- src/tree/gpu_hist/evaluate_splits.hip | 4 ---- src/tree/gpu_hist/evaluator.hip | 4 ---- src/tree/gpu_hist/feature_groups.hip | 4 ---- src/tree/gpu_hist/gradient_based_sampler.hip | 4 ---- src/tree/gpu_hist/histogram.hip | 4 ---- src/tree/gpu_hist/row_partitioner.hip | 4 ---- src/tree/updater_gpu_hist.hip | 4 ---- tests/cpp/plugin/federated/test_federated_coll.hip | 4 ++++ tests/cpp/plugin/federated/test_federated_comm_group.hip | 4 ++++ 53 files changed, 10 insertions(+), 199 deletions(-) delete mode 100644 src/c_api/c_api.hip delete mode 100644 src/collective/coll.hip delete mode 100644 src/collective/comm.hip delete mode 100644 src/collective/communicator.hip delete mode 100644 src/collective/nccl_device_communicator.hip delete mode 100644 src/common/common.hip delete mode 100644 src/common/hist_util.hip delete mode 100644 src/common/host_device_vector.hip delete mode 100644 src/common/numeric.hip delete mode 100644 src/common/quantile.hip delete mode 100644 src/common/random.hip delete mode 100644 src/common/ranking_utils.hip delete mode 100644 src/common/stats.hip delete mode 100644 src/context.hip delete mode 100644 src/data/array_interface.hip delete mode 100644 src/data/data.hip delete mode 100644 src/data/ellpack_page.hip delete mode 100644 src/data/ellpack_page_raw_format.hip delete mode 100644 src/data/ellpack_page_source.hip delete mode 100644 src/data/gradient_index.hip delete mode 100644 src/data/iterative_dmatrix.hip delete mode 100644 src/data/proxy_dmatrix.hip delete mode 100644 src/data/simple_dmatrix.hip delete mode 100644 src/data/sparse_page_dmatrix.hip delete mode 100644 src/data/sparse_page_source.hip delete mode 100644 src/gbm/gbtree.hip delete mode 100644 src/linear/updater_gpu_coordinate.hip delete mode 100644 src/metric/auc.hip delete mode 100644 src/metric/elementwise_metric.hip delete mode 100644 src/metric/multiclass_metric.hip delete mode 100644 src/metric/rank_metric.hip delete mode 100644 src/metric/survival_metric.hip delete mode 100644 src/objective/adaptive.hip delete mode 100644 src/objective/aft_obj.hip delete mode 100644 src/objective/hinge.hip delete mode 100644 src/objective/lambdarank_obj.hip delete mode 100644 src/objective/multiclass_obj.hip delete mode 100644 src/objective/quantile_obj.hip delete mode 100644 src/objective/regression_obj.hip delete mode 100644 src/predictor/gpu_predictor.hip delete mode 100644 src/tree/constraints.hip delete mode 100644 src/tree/fit_stump.hip delete mode 100644 src/tree/gpu_hist/evaluate_splits.hip delete mode 100644 src/tree/gpu_hist/evaluator.hip delete mode 100644 src/tree/gpu_hist/feature_groups.hip delete mode 100644 src/tree/gpu_hist/gradient_based_sampler.hip delete mode 100644 src/tree/gpu_hist/histogram.hip delete mode 100644 src/tree/gpu_hist/row_partitioner.hip delete mode 100644 src/tree/updater_gpu_hist.hip create mode 100644 tests/cpp/plugin/federated/test_federated_coll.hip create mode 100644 tests/cpp/plugin/federated/test_federated_comm_group.hip diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index f295d1446..fbc24a315 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -1,6 +1,5 @@ # Automatically set source group based on folder function(auto_source_group SOURCES) - foreach(FILE ${SOURCES}) get_filename_component(PARENT_DIR "${FILE}" PATH) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f674997af..297945ab9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,8 +17,9 @@ if(USE_CUDA) endif() if (USE_HIP) - file(GLOB_RECURSE HIP_SOURCES *.hip *.hip.h) + file(GLOB_RECURSE HIP_SOURCES *.cu *.hip.h) target_sources(objxgboost PRIVATE ${HIP_SOURCES}) + set_source_files_properties(${HIP_SOURCES} PROPERTIES LANGUAGE HIP) endif (USE_HIP) if(PLUGIN_SYCL) diff --git a/src/c_api/c_api.hip b/src/c_api/c_api.hip deleted file mode 100644 index 715845ea3..000000000 --- a/src/c_api/c_api.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "c_api.cu" -#endif diff --git a/src/collective/coll.hip b/src/collective/coll.hip deleted file mode 100644 index 8f3e09ac1..000000000 --- a/src/collective/coll.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "coll.cu" -#endif diff --git a/src/collective/comm.hip b/src/collective/comm.hip deleted file mode 100644 index e8619d41f..000000000 --- a/src/collective/comm.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "comm.cu" -#endif diff --git a/src/collective/communicator.hip b/src/collective/communicator.hip deleted file mode 100644 index 5a438771c..000000000 --- a/src/collective/communicator.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "communicator.cu" -#endif diff --git a/src/collective/nccl_device_communicator.hip b/src/collective/nccl_device_communicator.hip deleted file mode 100644 index 765c18d79..000000000 --- a/src/collective/nccl_device_communicator.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "nccl_device_communicator.cu" -#endif diff --git a/src/common/common.hip b/src/common/common.hip deleted file mode 100644 index c665b11bc..000000000 --- a/src/common/common.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "common.cu" -#endif diff --git a/src/common/hist_util.hip b/src/common/hist_util.hip deleted file mode 100644 index 86eb989b3..000000000 --- a/src/common/hist_util.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "hist_util.cu" -#endif diff --git a/src/common/host_device_vector.hip b/src/common/host_device_vector.hip deleted file mode 100644 index beae69382..000000000 --- a/src/common/host_device_vector.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "host_device_vector.cu" -#endif diff --git a/src/common/numeric.hip b/src/common/numeric.hip deleted file mode 100644 index 19c125901..000000000 --- a/src/common/numeric.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "numeric.cu" -#endif diff --git a/src/common/quantile.hip b/src/common/quantile.hip deleted file mode 100644 index c0e4385be..000000000 --- a/src/common/quantile.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "quantile.cu" -#endif diff --git a/src/common/random.hip b/src/common/random.hip deleted file mode 100644 index 8f2a6f7a0..000000000 --- a/src/common/random.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "random.cu" -#endif diff --git a/src/common/ranking_utils.hip b/src/common/ranking_utils.hip deleted file mode 100644 index a7860758d..000000000 --- a/src/common/ranking_utils.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "ranking_utils.cu" -#endif diff --git a/src/common/stats.hip b/src/common/stats.hip deleted file mode 100644 index b8d51225e..000000000 --- a/src/common/stats.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "stats.cu" -#endif diff --git a/src/context.hip b/src/context.hip deleted file mode 100644 index d4e3938bf..000000000 --- a/src/context.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "context.cu" -#endif diff --git a/src/data/array_interface.hip b/src/data/array_interface.hip deleted file mode 100644 index b90160d91..000000000 --- a/src/data/array_interface.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "array_interface.cu" -#endif diff --git a/src/data/data.hip b/src/data/data.hip deleted file mode 100644 index a0b80a7e0..000000000 --- a/src/data/data.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "data.cu" -#endif diff --git a/src/data/ellpack_page.hip b/src/data/ellpack_page.hip deleted file mode 100644 index 697e9a021..000000000 --- a/src/data/ellpack_page.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "ellpack_page.cu" -#endif diff --git a/src/data/ellpack_page_raw_format.hip b/src/data/ellpack_page_raw_format.hip deleted file mode 100644 index 9337d6afb..000000000 --- a/src/data/ellpack_page_raw_format.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "ellpack_page_raw_format.cu" -#endif diff --git a/src/data/ellpack_page_source.hip b/src/data/ellpack_page_source.hip deleted file mode 100644 index fe26c1cb2..000000000 --- a/src/data/ellpack_page_source.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "ellpack_page_source.cu" -#endif diff --git a/src/data/gradient_index.hip b/src/data/gradient_index.hip deleted file mode 100644 index 7cc0c154d..000000000 --- a/src/data/gradient_index.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "gradient_index.cu" -#endif diff --git a/src/data/iterative_dmatrix.hip b/src/data/iterative_dmatrix.hip deleted file mode 100644 index cba78dbe1..000000000 --- a/src/data/iterative_dmatrix.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "iterative_dmatrix.cu" -#endif diff --git a/src/data/proxy_dmatrix.hip b/src/data/proxy_dmatrix.hip deleted file mode 100644 index 6b50e6752..000000000 --- a/src/data/proxy_dmatrix.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "proxy_dmatrix.cu" -#endif diff --git a/src/data/simple_dmatrix.hip b/src/data/simple_dmatrix.hip deleted file mode 100644 index 9be8187e1..000000000 --- a/src/data/simple_dmatrix.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "simple_dmatrix.cu" -#endif diff --git a/src/data/sparse_page_dmatrix.hip b/src/data/sparse_page_dmatrix.hip deleted file mode 100644 index 89fe2ed4b..000000000 --- a/src/data/sparse_page_dmatrix.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "sparse_page_dmatrix.cu" -#endif diff --git a/src/data/sparse_page_source.hip b/src/data/sparse_page_source.hip deleted file mode 100644 index 3a3f71e2f..000000000 --- a/src/data/sparse_page_source.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "sparse_page_source.cu" -#endif diff --git a/src/gbm/gbtree.hip b/src/gbm/gbtree.hip deleted file mode 100644 index 76040e75f..000000000 --- a/src/gbm/gbtree.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "gbtree.cu" -#endif diff --git a/src/linear/updater_gpu_coordinate.hip b/src/linear/updater_gpu_coordinate.hip deleted file mode 100644 index b973a568f..000000000 --- a/src/linear/updater_gpu_coordinate.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "updater_gpu_coordinate.cu" -#endif diff --git a/src/metric/auc.hip b/src/metric/auc.hip deleted file mode 100644 index a96cbbde5..000000000 --- a/src/metric/auc.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "auc.cu" -#endif diff --git a/src/metric/elementwise_metric.hip b/src/metric/elementwise_metric.hip deleted file mode 100644 index 18e4916a4..000000000 --- a/src/metric/elementwise_metric.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "elementwise_metric.cu" -#endif diff --git a/src/metric/multiclass_metric.hip b/src/metric/multiclass_metric.hip deleted file mode 100644 index 4689644c8..000000000 --- a/src/metric/multiclass_metric.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "multiclass_metric.cu" -#endif // defined(XGBOOST_USE_HIP) diff --git a/src/metric/rank_metric.hip b/src/metric/rank_metric.hip deleted file mode 100644 index a8ed8b267..000000000 --- a/src/metric/rank_metric.hip +++ /dev/null @@ -1,5 +0,0 @@ - - -#if defined(XGBOOST_USE_HIP) -#include "rank_metric.cu" -#endif diff --git a/src/metric/survival_metric.hip b/src/metric/survival_metric.hip deleted file mode 100644 index 84a7d1ec2..000000000 --- a/src/metric/survival_metric.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "survival_metric.cu" -#endif diff --git a/src/objective/adaptive.hip b/src/objective/adaptive.hip deleted file mode 100644 index 7558ac176..000000000 --- a/src/objective/adaptive.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "adaptive.cu" -#endif diff --git a/src/objective/aft_obj.hip b/src/objective/aft_obj.hip deleted file mode 100644 index 24d5bbc15..000000000 --- a/src/objective/aft_obj.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "aft_obj.cu" -#endif diff --git a/src/objective/hinge.hip b/src/objective/hinge.hip deleted file mode 100644 index 08d3541b6..000000000 --- a/src/objective/hinge.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "hinge.cu" -#endif diff --git a/src/objective/lambdarank_obj.hip b/src/objective/lambdarank_obj.hip deleted file mode 100644 index a99255fdd..000000000 --- a/src/objective/lambdarank_obj.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "lambdarank_obj.cu" -#endif diff --git a/src/objective/multiclass_obj.hip b/src/objective/multiclass_obj.hip deleted file mode 100644 index 914398d38..000000000 --- a/src/objective/multiclass_obj.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "multiclass_obj.cu" -#endif diff --git a/src/objective/quantile_obj.hip b/src/objective/quantile_obj.hip deleted file mode 100644 index e755a5515..000000000 --- a/src/objective/quantile_obj.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "quantile_obj.cu" -#endif diff --git a/src/objective/regression_obj.hip b/src/objective/regression_obj.hip deleted file mode 100644 index 1812685af..000000000 --- a/src/objective/regression_obj.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "regression_obj.cu" -#endif diff --git a/src/predictor/gpu_predictor.hip b/src/predictor/gpu_predictor.hip deleted file mode 100644 index 33760f6dd..000000000 --- a/src/predictor/gpu_predictor.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "gpu_predictor.cu" -#endif diff --git a/src/tree/constraints.hip b/src/tree/constraints.hip deleted file mode 100644 index b8d6208cf..000000000 --- a/src/tree/constraints.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "constraints.cu" -#endif diff --git a/src/tree/fit_stump.hip b/src/tree/fit_stump.hip deleted file mode 100644 index 6b4ddd0af..000000000 --- a/src/tree/fit_stump.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "fit_stump.cu" -#endif diff --git a/src/tree/gpu_hist/evaluate_splits.hip b/src/tree/gpu_hist/evaluate_splits.hip deleted file mode 100644 index 4469d1c1f..000000000 --- a/src/tree/gpu_hist/evaluate_splits.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "evaluate_splits.cu" -#endif diff --git a/src/tree/gpu_hist/evaluator.hip b/src/tree/gpu_hist/evaluator.hip deleted file mode 100644 index b29dd089a..000000000 --- a/src/tree/gpu_hist/evaluator.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "evaluator.cu" -#endif diff --git a/src/tree/gpu_hist/feature_groups.hip b/src/tree/gpu_hist/feature_groups.hip deleted file mode 100644 index ebc9aa533..000000000 --- a/src/tree/gpu_hist/feature_groups.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "feature_groups.cu" -#endif diff --git a/src/tree/gpu_hist/gradient_based_sampler.hip b/src/tree/gpu_hist/gradient_based_sampler.hip deleted file mode 100644 index e7094cd3e..000000000 --- a/src/tree/gpu_hist/gradient_based_sampler.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "gradient_based_sampler.cu" -#endif diff --git a/src/tree/gpu_hist/histogram.hip b/src/tree/gpu_hist/histogram.hip deleted file mode 100644 index d505b3fd3..000000000 --- a/src/tree/gpu_hist/histogram.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "histogram.cu" -#endif diff --git a/src/tree/gpu_hist/row_partitioner.hip b/src/tree/gpu_hist/row_partitioner.hip deleted file mode 100644 index ac03ac0d7..000000000 --- a/src/tree/gpu_hist/row_partitioner.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "row_partitioner.cu" -#endif diff --git a/src/tree/updater_gpu_hist.hip b/src/tree/updater_gpu_hist.hip deleted file mode 100644 index e0f3be6a3..000000000 --- a/src/tree/updater_gpu_hist.hip +++ /dev/null @@ -1,4 +0,0 @@ - -#if defined(XGBOOST_USE_HIP) -#include "updater_gpu_hist.cu" -#endif diff --git a/tests/cpp/plugin/federated/test_federated_coll.hip b/tests/cpp/plugin/federated/test_federated_coll.hip new file mode 100644 index 000000000..af572c6a2 --- /dev/null +++ b/tests/cpp/plugin/federated/test_federated_coll.hip @@ -0,0 +1,4 @@ + +#ifdef XGBOOST_USE_HIP +#include "test_federated_coll.cu" +#endif diff --git a/tests/cpp/plugin/federated/test_federated_comm_group.hip b/tests/cpp/plugin/federated/test_federated_comm_group.hip new file mode 100644 index 000000000..077a4210d --- /dev/null +++ b/tests/cpp/plugin/federated/test_federated_comm_group.hip @@ -0,0 +1,4 @@ + +#ifdef XGBOOST_USE_HIP +#include "test_federated_comm_group.cu" +#endif