Merge branch 'develop'

bragadeesh · bragadeesh · commit 07e808694984 · 2018-06-12T10:20:18.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,6 +113,9 @@ option( BUILD_VERBOSE "Output additional build information" OFF )
 # BUILD_SHARED_LIBS is a cmake built-in; we make it an explicit option such that it shows in cmake-gui
 option( BUILD_SHARED_LIBS "Build rocFFT as a shared library" ON )
 
+# force library install path to lib (CentOS 7 defaults to lib64)
+set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE)
+
 # Find HCC/HIP dependencies
 if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$|.*/hipcc$" )
   message( STATUS "Building with ROCm tools" )
@@ -133,12 +136,9 @@ add_subdirectory( library )
 
 include( clients/cmake/build-options.cmake )
 
+
 # Build clients of the library
 if( BUILD_CLIENTS_SAMPLES OR BUILD_CLIENTS_TESTS OR BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_SELFTEST OR BUILD_CLIENTS_SAMPLES )
   add_subdirectory( clients )
 endif( )
 
-# This should always be last, and is necessary to fix an issue with using rocm-cmake
-# Cmake parses add_subdirectory in a breadth first style, instead of depth first.  This causes confusion in the cmake installer
-# where
-add_subdirectory( cmake )
diff --git a/clients/rider/misc.cpp b/clients/rider/misc.cpp
@@ -5,7 +5,7 @@
 
 #include <stdexcept>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "./misc.h"
 
 void setupBuffers( std::vector< int > devices,
diff --git a/clients/rider/rider.cpp b/clients/rider/rider.cpp
@@ -10,7 +10,7 @@
 #include <valarray>
 
 #include <boost/program_options.hpp>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "./rider.h"
 
 
diff --git a/clients/samples/fixed-16/fixed-16-double.cpp b/clients/samples/fixed-16/fixed-16-double.cpp
@@ -10,7 +10,7 @@
 #include <math.h>
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 
 
 int main()
diff --git a/clients/samples/fixed-16/fixed-16-float.cpp b/clients/samples/fixed-16/fixed-16-float.cpp
@@ -10,7 +10,7 @@
 #include <math.h>
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 
 
 int main()
diff --git a/clients/samples/fixed-large/fixed-large-double.cpp b/clients/samples/fixed-large/fixed-large-double.cpp
@@ -11,7 +11,7 @@
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 
 
 int main()
diff --git a/clients/samples/fixed-large/fixed-large-float.cpp b/clients/samples/fixed-large/fixed-large-float.cpp
@@ -11,7 +11,7 @@
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 
 
 int main()
diff --git a/clients/selftest/test_complex.cpp b/clients/selftest/test_complex.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <stdlib.h>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "./basis_vector.h"
 
 typedef float complex_single[2];
diff --git a/clients/tests/accuracy_test_1D.cpp b/clients/tests/accuracy_test_1D.cpp
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "test_constants.h"
 #include "rocfft_against_fftw.h"
 #include "fftw_transform.h"
diff --git a/clients/tests/accuracy_test_2D.cpp b/clients/tests/accuracy_test_2D.cpp
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "test_constants.h"
 #include "rocfft_against_fftw.h"
 #include "fftw_transform.h"
diff --git a/clients/tests/buffer.h b/clients/tests/buffer.h
@@ -14,7 +14,7 @@
 #include <vector>
 #include <utility>
 #include <sstream>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "test_constants.h"
 #include <boost/random.hpp>
 #include <stdint.h>
diff --git a/clients/tests/gtest_main.cpp b/clients/tests/gtest_main.cpp
@@ -10,7 +10,7 @@
 #include <gtest/gtest.h>
 #include <boost/program_options.hpp>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "test_constants.h"
 //namespace po = boost::program_options;
 
diff --git a/clients/tests/rocfft_against_fftw.h b/clients/tests/rocfft_against_fftw.h
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "test_constants.h"
 #include "rocfft_transform.h"
 #include "fftw_transform.h"
diff --git a/clients/tests/rocfft_transform.h b/clients/tests/rocfft_transform.h
@@ -9,7 +9,7 @@
 
 #include <iostream>
 #include <vector>
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "buffer.h"
 #include "test_constants.h"
 #include "../rider/misc.h" // to use LIB_V_THROW and HIP_V_THROW
diff --git a/clients/tests/test_constants.h b/clients/tests/test_constants.h
@@ -7,7 +7,7 @@
 #if !defined( TESTCONSTANTS_H )
 #define TESTCONSTANTS_H
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include <string>
 #include <stdexcept>
 
diff --git a/clients/tests/testing_transpose.hpp b/clients/tests/testing_transpose.hpp
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <sys/time.h>
 
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 #include "rocfft_transpose.h"
 #include "../rider/misc.h" // to use LIB_V_THROW and HIP_V_THROW
 
diff --git a/clients/tests/unit_test.cpp b/clients/tests/unit_test.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include "hip/hip_runtime_api.h"
 #include "hip/hip_vector_types.h"
-#include "rocfft/rocfft.h"
+#include "rocfft.h"
 
 
 TEST(rocfft_UnitTest, sample_code_iterative)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
diff --git a/cmake/package-functions.cmake b/cmake/package-functions.cmake
@@ -0,0 +1,63 @@
+# ########################################################################
+# A helper function to generate packaging scripts to register libraries with system
+# ########################################################################
+function( write_rocm_package_script_files scripts_write_dir library_name library_link_name )
+
+set( ld_conf_file "/etc/ld.so.conf.d/${library_name}-dev.conf" )
+
+file( WRITE ${scripts_write_dir}/postinst
+"#!/bin/bash
+
+set -e
+
+do_ldconfig() {
+  echo ${CPACK_PACKAGING_INSTALL_PREFIX}/${LIB_INSTALL_DIR} > ${ld_conf_file} && ldconfig
+}
+
+do_softlinks() {
+    ln -sr ${CPACK_PACKAGING_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} ${CPACK_PACKAGING_INSTALL_PREFIX}/../include/${library_name}
+    ln -sr ${CPACK_PACKAGING_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${library_link_name}.1 ${CPACK_PACKAGING_INSTALL_PREFIX}/../lib/${library_link_name}
+    ln -sr ${CPACK_PACKAGING_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/${library_name} ${CPACK_PACKAGING_INSTALL_PREFIX}/../lib/cmake/${library_name}
+}
+
+case \"\$1\" in
+   configure)
+        do_ldconfig
+        do_softlinks
+   ;;
+   abort-upgrade|abort-remove|abort-deconfigure)
+        echo \"\$1\"
+   ;;
+   *)
+        exit 0
+   ;;
+esac
+" )
+
+file( WRITE ${scripts_write_dir}/prerm
+"#!/bin/bash
+
+set -e
+
+rm_ldconfig() {
+    rm -f ${ld_conf_file} && ldconfig
+}
+
+rm_softlinks() {
+    rm -f ${CPACK_PACKAGING_INSTALL_PREFIX}/../include/${library_name}
+    rm -f ${CPACK_PACKAGING_INSTALL_PREFIX}/../lib/${library_link_name}
+    rm -f ${CPACK_PACKAGING_INSTALL_PREFIX}/../lib/cmake/${library_name}
+}
+
+case \"\$1\" in
+   remove|purge)
+       rm_ldconfig
+       rm_softlinks
+   ;;
+   *)
+        exit 0
+   ;;
+esac
+" )
+
+endfunction( )
diff --git a/docs/run_doc.sh b/docs/run_doc.sh
@@ -4,7 +4,7 @@ if [ -d docBin ]; then
     rm -rf docBin
 fi
 
-sed -e 's/ROCFFT_EXPORT //g' ../library/include/rocfft/rocfft.h > rocfft.h
+sed -e 's/ROCFFT_EXPORT //g' ../library/include/rocfft.h > rocfft.h
 doxygen Doxyfile
 
 cd source
diff --git a/docs/run_doxygen.sh b/docs/run_doxygen.sh
@@ -4,7 +4,7 @@ if [ -d docBin ]; then
     rm -rf docBin
 fi
 
-sed -e 's/ROCFFT_EXPORT //g' ../library/include/rocfft/rocfft.h > rocfft.h
+sed -e 's/ROCFFT_EXPORT //g' ../library/include/rocfft.h > rocfft.h
 doxygen Doxyfile
 rm rocfft.h
 
diff --git a/install.sh b/install.sh
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
diff --git a/library/include/hipfft.h b/library/include/hipfft.h
diff --git a/library/include/rocfft-version.h.in b/library/include/rocfft-version.h.in
diff --git a/library/include/rocfft.h b/library/include/rocfft.h
diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt
diff --git a/library/src/device/generator/CMakeLists.txt b/library/src/device/generator/CMakeLists.txt
