From 696f0595a3cb7e05b7a68ecabff3fc3ce7dd0d64 Mon Sep 17 00:00:00 2001 From: Alex Voicu Date: Thu, 22 Feb 2018 13:15:10 +0000 Subject: [PATCH] Change directory name to match HIP lowercase style. --- hipamd/CMakeLists.txt | 2 +- hipamd/bin/hipcc | 1 - hipamd/{LPL_CA => lpl_ca}/CMakeLists.txt | 0 hipamd/{LPL_CA => lpl_ca}/ca.cpp | 0 hipamd/{LPL_CA => lpl_ca}/ca.hpp | 0 hipamd/{LPL_CA => lpl_ca}/clara/clara.hpp | 0 hipamd/{LPL_CA => lpl_ca}/common.hpp | 0 hipamd/{LPL_CA => lpl_ca}/lpl.cpp | 0 hipamd/{LPL_CA => lpl_ca}/lpl.hpp | 0 hipamd/{LPL_CA => lpl_ca}/pstreams/pstream.h | 0 hipamd/src/hip_memory.cpp | 3 ++- 11 files changed, 3 insertions(+), 3 deletions(-) rename hipamd/{LPL_CA => lpl_ca}/CMakeLists.txt (100%) rename hipamd/{LPL_CA => lpl_ca}/ca.cpp (100%) rename hipamd/{LPL_CA => lpl_ca}/ca.hpp (100%) rename hipamd/{LPL_CA => lpl_ca}/clara/clara.hpp (100%) rename hipamd/{LPL_CA => lpl_ca}/common.hpp (100%) rename hipamd/{LPL_CA => lpl_ca}/lpl.cpp (100%) rename hipamd/{LPL_CA => lpl_ca}/lpl.hpp (100%) rename hipamd/{LPL_CA => lpl_ca}/pstreams/pstream.h (100%) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 7b9aad9c3c..60a3fb40f2 100644 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -148,7 +148,7 @@ endif() # platform is hcc; do this before the ugly hijacking of the compiler, since no # HC code is involved. if (HIP_PLATFORM STREQUAL "hcc") - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/LPL_CA) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca) endif () # Build hip_hcc if platform is hcc diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc index dbeedb77b1..14b8ba650c 100755 --- a/hipamd/bin/hipcc +++ b/hipamd/bin/hipcc @@ -216,7 +216,6 @@ if($HIP_PLATFORM eq "hcc"){ } if(($HIP_PLATFORM eq "hcc")){ - $EXPORT_LL=" "; $ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_hc.ll\n"; $ENV{HIP_HC_IR_FILE}=""; } diff --git a/hipamd/LPL_CA/CMakeLists.txt b/hipamd/lpl_ca/CMakeLists.txt similarity index 100% rename from hipamd/LPL_CA/CMakeLists.txt rename to hipamd/lpl_ca/CMakeLists.txt diff --git a/hipamd/LPL_CA/ca.cpp b/hipamd/lpl_ca/ca.cpp similarity index 100% rename from hipamd/LPL_CA/ca.cpp rename to hipamd/lpl_ca/ca.cpp diff --git a/hipamd/LPL_CA/ca.hpp b/hipamd/lpl_ca/ca.hpp similarity index 100% rename from hipamd/LPL_CA/ca.hpp rename to hipamd/lpl_ca/ca.hpp diff --git a/hipamd/LPL_CA/clara/clara.hpp b/hipamd/lpl_ca/clara/clara.hpp similarity index 100% rename from hipamd/LPL_CA/clara/clara.hpp rename to hipamd/lpl_ca/clara/clara.hpp diff --git a/hipamd/LPL_CA/common.hpp b/hipamd/lpl_ca/common.hpp similarity index 100% rename from hipamd/LPL_CA/common.hpp rename to hipamd/lpl_ca/common.hpp diff --git a/hipamd/LPL_CA/lpl.cpp b/hipamd/lpl_ca/lpl.cpp similarity index 100% rename from hipamd/LPL_CA/lpl.cpp rename to hipamd/lpl_ca/lpl.cpp diff --git a/hipamd/LPL_CA/lpl.hpp b/hipamd/lpl_ca/lpl.hpp similarity index 100% rename from hipamd/LPL_CA/lpl.hpp rename to hipamd/lpl_ca/lpl.hpp diff --git a/hipamd/LPL_CA/pstreams/pstream.h b/hipamd/lpl_ca/pstreams/pstream.h similarity index 100% rename from hipamd/LPL_CA/pstreams/pstream.h rename to hipamd/lpl_ca/pstreams/pstream.h diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp index ea6462caf4..cbc6276795 100644 --- a/hipamd/src/hip_memory.cpp +++ b/hipamd/src/hip_memory.cpp @@ -780,7 +780,7 @@ hipError_t hipMalloc3DArray(hipArray_t *array, array[0]->depth = extent.depth; array[0]->desc = *desc; array[0]->isDrv = false; - array[0]->textureType = hipTextureType3D; + array[0]->textureType = hipTextureType3D; void ** ptr = &array[0]->data; if (ctx) { @@ -1553,6 +1553,7 @@ hipError_t hipMemcpy3D(const struct hipMemcpy3DParms *p) } return ihipLogStatus(e); } + namespace { template<