Merge pull request #108 from kknox/disable-cuda-build

Updating automation

Author: bragadeesh

CMakeLists.txt

@@ -114,11 +114,18 @@ option( BUILD_VERBOSE "Output additional build information" OFF )
 option( BUILD_SHARED_LIBS "Build rocFFT as a shared library" ON )
 
 # Find HCC/HIP dependencies
-if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
+if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$|.*/hipcc$" )
+  message( STATUS "Building with ROCm tools" )
   find_package( hcc REQUIRED CONFIG PATHS /opt/rocm )
-  find_package( hip REQUIRED CONFIG PATHS /opt/rocm )
 endif( )
 
+# Hip headers required of all clients; clients use hip to allocate device memory
+find_package( hip REQUIRED CONFIG PATHS /opt/rocm )
+
+# Quietly look for CUDA, but if not found it's not an error
+# The presense of hip is not sufficient to determine if we want a rocm or cuda backend
+find_package( CUDA QUIET )
+
 # CMake list of machine targets
 set( AMDGPU_TARGETS gfx803;gfx900 CACHE STRING "List of specific machine types for library to target" )
 

Jenkinsfile

@@ -204,12 +204,12 @@ Boolean docker_build_inside_image( def build_image, compiler_data compiler_args,
             set -x
             rm -rf ${docker_context} && mkdir -p ${docker_context}
             mv ${paths.project_build_prefix}/build/release/*.deb ${docker_context}
-            mv ${paths.project_build_prefix}/build/release/*.rpm ${docker_context}
+            # mv ${paths.project_build_prefix}/build/release/*.rpm ${docker_context}
             dpkg -c ${docker_context}/*.deb
         """
 
         archiveArtifacts artifacts: "${docker_context}/*.deb", fingerprint: true
-        archiveArtifacts artifacts: "${docker_context}/*.rpm", fingerprint: true
+        // archiveArtifacts artifacts: "${docker_context}/*.rpm", fingerprint: true
       }
     }
   }
@@ -348,13 +348,13 @@ def build_pipeline( compiler_data compiler_args, docker_data docker_args, projec
 // The following launches 3 builds in parallel: hcc-ctu, hcc-1.6 and cuda
 parallel hcc_ctu:
 {
-  node( 'docker && rocm' )
+  node( 'docker && rocm && dkms' )
   {
     def docker_args = new docker_data(
         from_image:'compute-artifactory:5001/rocm-developer-tools/hip/master/hip-hcc-ctu-ubuntu-16.04:latest',
-        build_docker_file:'dockerfile-build-hip-hcc-ctu-ubuntu-16.04',
-        install_docker_file:'dockerfile-install-hip-hcc-ctu-ubuntu-16.04',
-        docker_run_args:'--device=/dev/kfd',
+        build_docker_file:'dockerfile-build-ubuntu-16.04',
+        install_docker_file:'dockerfile-rocfft-ubuntu-16.04',
+        docker_run_args:'--device=/dev/kfd --device=/dev/dri --group-add=video',
         docker_build_args:' --pull' )
 
     def compiler_args = new compiler_data(
@@ -381,13 +381,13 @@ parallel hcc_ctu:
 },
 hcc_rocm:
 {
-  node( 'docker && rocm' )
+  node( 'docker && rocm && !dkms' )
   {
     def hcc_docker_args = new docker_data(
-        from_image:'rocm/rocm-terminal:latest',
-        build_docker_file:'dockerfile-build-rocm-terminal',
-        install_docker_file:'dockerfile-install-rocm-terminal',
-        docker_run_args:'--device=/dev/kfd',
+        from_image:'rocm/dev-ubuntu-16.04:latest',
+        build_docker_file:'dockerfile-build-ubuntu-16.04',
+        install_docker_file:'dockerfile-rocfft-ubuntu-16.04',
+        docker_run_args:'--device=/dev/kfd --device=/dev/dri --group-add=video',
         docker_build_args:' --pull' )
 
     def hcc_compiler_args = new compiler_data(
@@ -411,38 +411,37 @@ hcc_rocm:
 
     build_pipeline( hcc_compiler_args, hcc_docker_args, rocfft_paths, print_version_closure )
   }
-},
-nvcc:
-{
-  node( 'docker && cuda' )
-  {
-    def hcc_docker_args = new docker_data(
-        from_image:'nvidia/cuda:9.0-devel',
-        build_docker_file:'dockerfile-build-nvidia-cuda',
-        install_docker_file:'dockerfile-install-nvidia-cuda',
-        docker_run_args:'--device=/dev/nvidiactl --device=/dev/nvidia0 --device=/dev/nvidia-uvm --device=/dev/nvidia-uvm-tools --volume-driver=nvidia-docker --volume=nvidia_driver_384.90:/usr/local/nvidia:ro',
-        docker_build_args:' --pull' )
-
-    def hcc_compiler_args = new compiler_data(
-        compiler_name:'nvcc-9.0',
-        build_config:'Release',
-        compiler_path:'g++' )
-
-    def rocfft_paths = new project_paths(
-        project_name:'rocfft-nvcc',
-        src_prefix:'src',
-        build_prefix:'src',
-        build_command: './install.sh -cd --cuda' )
-
-    def print_version_closure = {
-      sh  """
-          set -x
-          nvidia-smi
-          nvcc --version
-        """
-    }
-
-    build_pipeline( hcc_compiler_args, hcc_docker_args, rocfft_paths, print_version_closure )
-  }
-}
-
+} //,
+// nvcc:
+// {
+//   node( 'docker && cuda' )
+//   {
+//     def hcc_docker_args = new docker_data(
+//         from_image:'nvidia/cuda:9.1-devel-ubuntu16.04',
+//         build_docker_file:'dockerfile-build-nvidia-cuda',
+//         install_docker_file:'dockerfile-rocfft-ubuntu-cuda',
+//         docker_run_args:'--runtime=nvidia',
+//         docker_build_args:' --pull' )
+
+//     def hcc_compiler_args = new compiler_data(
+//         compiler_name:'nvcc-9.1',
+//         build_config:'Release',
+//         compiler_path:'g++' )
+
+//     def rocfft_paths = new project_paths(
+//         project_name:'rocfft-nvcc',
+//         src_prefix:'src',
+//         build_prefix:'src',
+//         build_command: './install.sh -cd --cuda' )
+
+//     def print_version_closure = {
+//       sh  """
+//           set -x
+//           nvidia-smi
+//           nvcc --version
+//         """
+//     }
+
+//     build_pipeline( hcc_compiler_args, hcc_docker_args, rocfft_paths, print_version_closure )
+//   }
+// }

docker/dockerfile-build-hip-hcc-ctu-ubuntu-16.04

@@ -26,9 +26,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     pkg-config \
     libfftw3-dev \
     libboost-program-options-dev \
-    hip_hcc \
-    hip_nvcc \
-    cuda \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

docker/dockerfile-build-nvidia-cuda

@@ -1,28 +1,28 @@
-# This Dockerfile provides a starting point for a ROCm installation of hipCaffe.
-
-# Parameters related to building hip
+# Parameters related to building rocfft
 ARG base_image
 
 FROM ${base_image}
-LABEL maintainer="kent.knox@amd"
+MAINTAINER Kent Knox <kent.knox@amd>
 
-USER root
 ARG user_uid
 
-# Install dependent packages
+# Install Packages & dependent packages
 # Dependencies:
 # * hcc-config.cmake: pkg-config
-# * tensile: python2.7, python-yaml
-# * rocblas-test: gfortran, googletest
-# * rocblas-bench: libboost-program-options-dev
+# * rocblas-test: libfftw3-dev, googletest
+# * rocfft-bench: libboost-program-options-dev
+# * rocm_agent_enumerator: python, libnuma1
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    sudo \
+    build-essential \
     cmake \
     ca-certificates \
     git \
     pkg-config \
     libfftw3-dev \
     libboost-program-options-dev \
-    rpm \
+    python \
+    libnuma1 \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

docker/dockerfile-build-rocm-terminal renamed to docker/dockerfile-build-ubuntu-16.04

@@ -1,10 +1,10 @@
-# Parameters related to building rocblas
+# Parameters related to building rocfft
 ARG base_image
 
 FROM ${base_image}
 LABEL maintainer="kent.knox@amd"
 
-# Copy the debian package of rocblas into the container from host
+# Copy the debian package of rocfft into the container from host
 COPY *.deb /tmp/
 
 # Install the debian package

docker/dockerfile-install-rocm-terminal

@@ -158,13 +158,14 @@ if [[ "${install_dependencies}" == true ]]; then
       fi
     done
 
-    # The following builds googletest from source, installs into cmake default /usr/local
+    # The following builds googletest from source
     pushd .
-      printf "\033[32mBuilding \033[33mgoogletest\033[32m from source; installing into \033[33m/usr/local\033[0m\n"
+      printf "\033[32mBuilding \033[33mgoogletest\033[32m from source"
       mkdir -p ${build_dir}/deps && cd ${build_dir}/deps
-      cmake -DBUILD_BOOST=OFF ../../deps
+      cmake -DBUILD_BOOST=OFF -DCMAKE_INSTALL_PREFIX=deps-install ../../deps
       make -j$(nproc)
-      elevate_if_not_root make install
+      # elevate_if_not_root make install
+      make install
     popd
   fi
 
@@ -195,7 +196,7 @@ pushd .
 
   # On ROCm platforms, hcc compiler can build everything
   if [[ "${build_cuda}" == false ]]; then
-    CXX=hcc cmake ${cmake_common_options} ${cmake_client_options} ../..
+    CXX=hcc cmake ${cmake_common_options} ${cmake_client_options} -DCMAKE_PREFIX_PATH="$(pwd)/../deps/deps-install" ../..
     make -j$(nproc)
   else
     # The nvidia compile is a little more complicated, in that we split compiling the library from the clients
@@ -213,7 +214,7 @@ pushd .
     # Build cuda clients with default host compiler
     if [[ "${build_clients}" == true ]]; then
       pushd clients
-        cmake ${cmake_common_options} ${cmake_client_options} -DCMAKE_PREFIX_PATH=$(pwd)/../rocfft-install ../../../clients
+        cmake ${cmake_common_options} ${cmake_client_options} -DCMAKE_PREFIX_PATH="$(pwd)/../rocfft-install;$(pwd)/../deps/deps-install" ../../../clients
         make -j$(nproc)
       popd
     fi

docker/dockerfile-install-hip-hcc-ctu-ubuntu-16.04 renamed to docker/dockerfile-rocfft-ubuntu-16.04

@@ -106,30 +106,39 @@ set( INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} )
 add_subdirectory( src )
 
 # The following code is setting variables to control the behavior of CPack to generate our
-if( WIN32 )
-    set( CPACK_SOURCE_GENERATOR "ZIP" )
-    set( CPACK_GENERATOR "ZIP" )
-else( )
-    set( CPACK_SOURCE_GENERATOR "TGZ" )
-    set( CPACK_GENERATOR "DEB;RPM" CACHE STRING "cpack list: 7Z, DEB, IFW, NSIS, NSIS64, RPM, STGZ, TBZ2, TGZ, TXZ, TZ, ZIP" )
-    # set( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON )
-endif( )
+# if( WIN32 )
+#     set( CPACK_SOURCE_GENERATOR "ZIP" )
+#     set( CPACK_GENERATOR "ZIP" )
+# else( )
+#     set( CPACK_SOURCE_GENERATOR "TGZ" )
+#     set( CPACK_GENERATOR "DEB;RPM" CACHE STRING "cpack list: 7Z, DEB, IFW, NSIS, NSIS64, RPM, STGZ, TBZ2, TGZ, TXZ, TZ, ZIP" )
+#     # set( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON )
+# endif( )
 
 # Package specific CPACK vars
-set( CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc (>= 1.0.17174)" )
-set( CPACK_RPM_PACKAGE_REQUIRES "hip_hcc >= 1.0.17174" )
+set( CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc (>= 1.3)" )
+set( CPACK_RPM_PACKAGE_REQUIRES "hip_hcc >= 1.3" )
 set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.md" )
 
+if( NOT CPACK_PACKAGING_INSTALL_PREFIX )
+  set( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
+endif( )
+
+set( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "\${CPACK_PACKAGING_INSTALL_PREFIX}" "\${CPACK_PACKAGING_INSTALL_PREFIX}/include" )
+
 # Give rocfft compiled for CUDA backend a different name
-if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
-    set( package_name rocfft )
+if( NOT CUDA_FOUND )
+  set( package_name rocfft )
 else( )
-    set( package_name rocfft-alt )
+  set( package_name rocfft-alt )
 endif( )
 
+set( ROCFFT_CONFIG_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Path placed into ldconfig file" )
+
 rocm_create_package(
     NAME ${package_name}
     DESCRIPTION "Radeon Open Compute FFT library"
     MAINTAINER "Kent Knox <[email protected]>"
     LDCONFIG
+    LDCONFIG_DIR ${ROCFFT_CONFIG_DIR}
 )