corrected cmake

hipamd/CMakeLists.txt

@@ -2,32 +2,34 @@ cmake_minimum_required(VERSION 2.6)
 project(hip_hcc)
 
 # preserve HCC_HOME env in the generated
-set (HCC_HOME $ENV{HCC_HOME})
-if (NOT DEFINED HCC_HOME)
-    set (HCC_HOME /opt/hcc)
+
+if (NOT DEFINED HCC_DIR)
+    set (HCC_DIR "/opt/hcc")
 endif()
+message(STATUS ${HCC_DIR})
 
-MESSAGE ("HCC_HOME=" ${HCC_HOME})
-
-set(HSA_PATH "/opt/hsa")
-
-
-set (HIP_INSTALL_PATH $ENV{HIP_PATH})
-if (NOT DEFINED HIP_INSTALL_PATH)
-    set (HIP_INSTALLPATH /opt/hip)
+if(NOT DEFINED HIP_INSTALL_DIR)
+    set(HIP_INSTALL_DIR "/opt/hip")
 endif()
+message(STATUS ${HIP_INSTALL_DIR})
 
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "${HIP_INSTALL_PATH}" CACHE PATH "Default installation path of hip" FORCE)
-endif ()
+if(NOT DEFINED HSA_DIR)
+    set(HSA_DIR "/opt/hsa")
+endif()
+message(STATUS ${HSA_DIR})
+
+
+#if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+#    set(CMAKE_INSTALL_PREFIX "${HIP_INSTALL_PATH}" CACHE PATH "Default installation path of hip" FORCE)
+#endif ()
 
 include_directories(${PROJECT_SOURCE_DIR}/include)
 
-set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc")
-set(CMAKE_C_COMPILER   "${HCC_HOME}/bin/hcc")
+set(CMAKE_CXX_COMPILER "${HCC_DIR}/bin/hcc")
+set(CMAKE_C_COMPILER   "${HCC_DIR}/bin/hcc")
 
-set(CMAKE_CXX_FLAGS " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I${HIP_PATH}/include -stdlib=libc++ ")
-set(CMAKE_C_FLAGS   " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I${HIP_PATH}/include -stdlib=libc++ ")
+set(CMAKE_CXX_FLAGS " -hc -I${HCC_DIR}/include -I${HSA_DIR}/include -stdlib=libc++ ")
+set(CMAKE_C_FLAGS   " -hc -I${HCC_DIR}/include -I${HSA_DIR}/include -stdlib=libc++ ")
 
 set(SOURCE_FILES src/hip_hcc.cpp 
 src/hip_device.cpp
@@ -40,9 +42,9 @@ src/staging_buffer.cpp)
 
 add_library(hip_hcc STATIC ${SOURCE_FILES})
 
-install(TARGETS hip_hcc DESTINATION lib)
-install(DIRECTORY src DESTINATION .)
-install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS)
-install(DIRECTORY include DESTINATION .)
+install(TARGETS hip_hcc DESTINATION ${HIP_INSTALL_DIR}/lib)
+install(DIRECTORY src DESTINATION ${HIP_INSTALL_DIR})
+install(DIRECTORY bin DESTINATION ${HIP_INSTALL_DIR}  USE_SOURCE_PERMISSIONS)
+install(DIRECTORY include DESTINATION ${HIP_INSTALL_DIR})
 
 

hipamd/tests/src/CMakeLists.txt

@@ -8,7 +8,8 @@ include_directories( ${PROJECT_SOURCE_DIR}/include )
 set (HIP_Unit_Test_VERSION_MAJOR 1)
 set (HIP_Unit_Test_VERSION_MINOR 0)
 
-set (HIP_PATH $ENV{HIP_PATH})
+set(HIP_PATH $ENV{HIP_PATH})
+MESSAGE("HIP_PATH=" ${HIP_PATH})
 if (NOT DEFINED HIP_PATH)
 	set (HIP_PATH ../..)
 endif()
@@ -44,9 +45,7 @@ if (${HIP_PLATFORM} STREQUAL "hcc")
 
     # This will create a subdir "hip_hcc" in the test build directory
     # Any changes to hip_hcc source will be detected and force the library and then the tests to be rebuilt.  
-    add_subdirectory(${HIP_PATH} hip_hcc)
-    link_directories(${CMAKE_CURRENT_BINARY_DIR}/hip_hcc)  # search the local hip_hcc for libhip_hcc.a
-
+    
 elseif (${HIP_PLATFORM} STREQUAL "nvcc")
 	MESSAGE ("HIP_PLATFORM=nvcc")
 

hipamd/tests/src/hipHostAlloc.cpp

@@ -40,7 +40,7 @@ HIPCHECK(hipGetDevice(&device));
 HIPCHECK(hipGetDeviceProperties(&prop, device));
 if(prop.canMapHostMemory != 1){
 std::cout<<"Exiting..."<<std::endl;
-failed();
+failed("Does support HostPinned Memory");
 }
 
 HIPCHECK(hipHostMalloc((void**)&A, SIZE, hipHostMallocWriteCombined | hipHostMallocMapped));