Remove File reorganization backward compatibility (rccl) (#1753)

CMakeLists.txt

@@ -20,7 +20,6 @@ project(rccl CXX)
 #==================================================================================================
 option(BUILD_ADDRESS_SANITIZER                 "Enable address sanitizer"                      OFF)
 option(BUILD_BFD                               "Enable custom backtrace (if bfd.h exists)"     OFF)
-option(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY "File/folder reorg with backward compatibility" OFF)
 option(BUILD_LOCAL_GPU_TARGET_ONLY             "Build only for GPUs detected on this machine"  OFF)
 option(BUILD_SHARED_LIBS                       "Build as shared library"                       ON)
 option(BUILD_TESTS                             "Build unit test programs"                      OFF)
@@ -1069,24 +1068,6 @@ rocm_export_targets(
   TARGETS   rccl
   DEPENDS   hip)
 
-## Build with backwards compatibility if requested
-if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
-  ### Create wrapper files
-  rocm_wrap_header_dir(
-    "${PROJECT_BINARY_DIR}/include/rccl"
-    PATTERNS "rccl.h"
-    GUARDS SYMLINK WRAPPER
-    WRAPPER_LOCATIONS ${CMAKE_INSTALL_INCLUDEDIR} rccl/${CMAKE_INSTALL_INCLUDEDIR})
-
-  ### install the wrapper header file to package
-  rocm_install(
-    FILES ${PROJECT_BINARY_DIR}/rccl/include/rccl.h src/include/plugin/nccl_net.h
-    DESTINATION "./rccl/${CMAKE_INSTALL_INCLUDEDIR}/" )
-  rocm_install(
-    FILES ${PROJECT_BINARY_DIR}/include/rccl.h src/include/plugin/nccl_net.h
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/" )
-endif()
-
 ## Set package dependencies
 if(BUILD_ADDRESS_SANITIZER)
   set(DEPENDS_HIP_RUNTIME "hip-runtime-amd-asan" )

install.sh

@@ -65,7 +65,6 @@ function display_help()
     echo "       --openmp-test-enable    Enable OpenMP in rccl unit tests"
     echo "    -p|--package_build         Build RCCL package"
     echo "       --prefix                Specify custom directory to install RCCL to (default: \`/opt/rocm\`)"
-    echo "       --rm-legacy-include-dir Remove legacy include dir Packaging added for file/folder reorg backward compatibility"
     echo "       --run_tests_all         Run all rccl unit tests (must be built already)"
     echo "    -r|--run_tests_quick       Run small subset of rccl unit tests (must be built already)"
     echo "       --static                Build RCCL as a static library instead of shared library"
@@ -118,7 +117,6 @@ while true; do
          --openmp-test-enable)       openmp_test_enabled=true;                                                                         shift ;;
     -p | --package_build)            build_package=true;                                                                               shift ;;
          --prefix)                   install_library=true; install_prefix=${2};                                                        shift 2 ;;
-         --rm-legacy-include-dir)    build_freorg_bkwdcomp=false;                                                                      shift ;;
     -r | --run_tests_quick)          run_tests=true;                                                                                   shift ;;
          --run_tests_all)            run_tests=true; run_tests_all=true;                                                               shift ;;
          --static)                   build_static=true;                                                                                shift ;;
@@ -221,11 +219,6 @@ if [[ "${build_bfd}" == true ]]; then
     cmake_common_options="${cmake_common_options} -DBUILD_BFD=ON"
 fi
 
-# Backward compatibility wrappers
-if [[ "${build_freorg_bkwdcomp}" == true ]]; then
-    cmake_common_options="${cmake_common_options} -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=ON"
-fi
-
 # Build local GPU arch only
 if [[ "${build_local_gpu_only}" == true ]]; then
     cmake_common_options="${cmake_common_options} -DBUILD_LOCAL_GPU_TARGET_ONLY=ON"