Merge pull request #428 from colesbury/CMake

Install THCUNN.h and generic/THCUNN.h

20 files changed, 22 insertions, 2 deletions

diff --git a/lib/THCUNN/Abs.cu b/lib/THCUNN/Abs.cu
index 0abefd9..f3c7592 100644
--- a/lib/THCUNN/Abs.cu
+++ b/lib/THCUNN/Abs.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct absupdateOutput_functor
diff --git a/lib/THCUNN/CMakeLists.txt b/lib/THCUNN/CMakeLists.txt
index 1b3dea7..28fa2e7 100644
--- a/lib/THCUNN/CMakeLists.txt
+++ b/lib/THCUNN/CMakeLists.txt
@@ -41,6 +41,7 @@ ENDIF()
 
 IF(NOT THCUNN_INSTALL_LIB_SUBDIR)
   SET(THCUNN_INSTALL_LIB_SUBDIR "lib" CACHE PATH "THCUNN install library directory")
+  SET(THCUNN_INSTALL_INCLUDE_SUBDIR "include" CACHE PATH "THCUNN install include subdirectory")
 ENDIF()
 
 FILE(GLOB src-cuda *.cu)
@@ -64,3 +65,5 @@ IF(THCUNN_SO_VERSION)
 ENDIF(THCUNN_SO_VERSION)
 
 INSTALL(TARGETS THCUNN LIBRARY DESTINATION ${THCUNN_INSTALL_LIB_SUBDIR})
+INSTALL(FILES THCUNN.h DESTINATION "${THCUNN_INSTALL_INCLUDE_SUBDIR}/THCUNN")
+INSTALL(FILES generic/THCUNN.h DESTINATION "${THCUNN_INSTALL_INCLUDE_SUBDIR}/THCUNN/generic")
diff --git a/lib/THCUNN/ELU.cu b/lib/THCUNN/ELU.cu
index ced993c..484adec 100644
--- a/lib/THCUNN/ELU.cu
+++ b/lib/THCUNN/ELU.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct ELUupdateOutput_functor
diff --git a/lib/THCUNN/HardTanh.cu b/lib/THCUNN/HardTanh.cu
index b400beb..0543a4c 100644
--- a/lib/THCUNN/HardTanh.cu
+++ b/lib/THCUNN/HardTanh.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct hardtanhupdateOutput_functor
diff --git a/lib/THCUNN/LeakyReLU.cu b/lib/THCUNN/LeakyReLU.cu
index 8c0e6f8..ec9efb8 100644
--- a/lib/THCUNN/LeakyReLU.cu
+++ b/lib/THCUNN/LeakyReLU.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct LeakyReLUUpdateOutput
diff --git a/lib/THCUNN/LogSigmoid.cu b/lib/THCUNN/LogSigmoid.cu
index f008b63..d6152ea 100644
--- a/lib/THCUNN/LogSigmoid.cu
+++ b/lib/THCUNN/LogSigmoid.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct logSigmoid_updateOutput_functor
diff --git a/lib/THCUNN/PReLU.cu b/lib/THCUNN/PReLU.cu
index dfac397..395e4a1 100644
--- a/lib/THCUNN/PReLU.cu
+++ b/lib/THCUNN/PReLU.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 #include "common.h"
 
diff --git a/lib/THCUNN/RReLU.cu b/lib/THCUNN/RReLU.cu
index 1da2f11..bf45035 100644
--- a/lib/THCUNN/RReLU.cu
+++ b/lib/THCUNN/RReLU.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 #include "common.h"
 #include <curand.h>
 #include <curand_kernel.h>
diff --git a/lib/THCUNN/Sigmoid.cu b/lib/THCUNN/Sigmoid.cu
index 623b84d..88d217f 100644
--- a/lib/THCUNN/Sigmoid.cu
+++ b/lib/THCUNN/Sigmoid.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct sigmoidupdateOutput_functor
diff --git a/lib/THCUNN/SoftPlus.cu b/lib/THCUNN/SoftPlus.cu
index cb9ecb7..42b2c3c 100644
--- a/lib/THCUNN/SoftPlus.cu
+++ b/lib/THCUNN/SoftPlus.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct softPlusupdateOutput_functor
diff --git a/lib/THCUNN/SoftShrink.cu b/lib/THCUNN/SoftShrink.cu
index 7762449..a4e45d8 100644
--- a/lib/THCUNN/SoftShrink.cu
+++ b/lib/THCUNN/SoftShrink.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct SoftShrinkUpdateOutput
diff --git a/lib/THCUNN/SpatialClassNLLCriterion.cu b/lib/THCUNN/SpatialClassNLLCriterion.cu
index 4b2f523..fe3cb02 100644
--- a/lib/THCUNN/SpatialClassNLLCriterion.cu
+++ b/lib/THCUNN/SpatialClassNLLCriterion.cu
@@ -3,6 +3,7 @@
 #include "THCHalfAutoNumerics.cuh"
 #include "THCAtomics.cuh"
 #include "common.h"
+#include <THC/THCApply.cuh>
 
 #include <thrust/functional.h>
 
diff --git a/lib/THCUNN/SpatialReflectionPadding.cu b/lib/THCUNN/SpatialReflectionPadding.cu
index f53a74e..3fd2751 100644
--- a/lib/THCUNN/SpatialReflectionPadding.cu
+++ b/lib/THCUNN/SpatialReflectionPadding.cu
@@ -4,6 +4,7 @@
 #include "THCDeviceTensorUtils.cuh"
 #include "THCDeviceUtils.cuh"
 #include "THCReduceApplyUtils.cuh"
+#include <THC/THCApply.cuh>
 
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
diff --git a/lib/THCUNN/SpatialReplicationPadding.cu b/lib/THCUNN/SpatialReplicationPadding.cu
index 2c25918..3d2dfe2 100644
--- a/lib/THCUNN/SpatialReplicationPadding.cu
+++ b/lib/THCUNN/SpatialReplicationPadding.cu
@@ -4,6 +4,7 @@
 #include "THCDeviceTensorUtils.cuh"
 #include "THCDeviceUtils.cuh"
 #include "THCReduceApplyUtils.cuh"
+#include <THC/THCApply.cuh>
 
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
diff --git a/lib/THCUNN/Sqrt.cu b/lib/THCUNN/Sqrt.cu
index 9d0dddc..a52ce34 100644
--- a/lib/THCUNN/Sqrt.cu
+++ b/lib/THCUNN/Sqrt.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct sqrtupdateOutput_functor
diff --git a/lib/THCUNN/Square.cu b/lib/THCUNN/Square.cu
index 4acf67f..66bbec4 100644
--- a/lib/THCUNN/Square.cu
+++ b/lib/THCUNN/Square.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct squareupdateOutput_functor
diff --git a/lib/THCUNN/THCUNN.h b/lib/THCUNN/THCUNN.h
index 4e95b06..5d38e3b 100644
--- a/lib/THCUNN/THCUNN.h
+++ b/lib/THCUNN/THCUNN.h
@@ -1,5 +1,4 @@
 #include <THC/THC.h>
-#include <THC/THCApply.cuh>
 
 #define THCIndexTensor THCudaLongTensor
 #define THCIndexTensor_(NAME) THCudaLongTensor_ ## NAME
@@ -8,4 +7,4 @@ typedef long THCIndex_t;
 #define THNN_(NAME) TH_CONCAT_3(THNN_, CReal, NAME)
 
 #include "generic/THCUNN.h"
-#include "THCGenerateFloatTypes.h"
+#include <THC/THCGenerateFloatTypes.h>
diff --git a/lib/THCUNN/Tanh.cu b/lib/THCUNN/Tanh.cu
index 0bd1ee8..fa423b7 100644
--- a/lib/THCUNN/Tanh.cu
+++ b/lib/THCUNN/Tanh.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct tanhupdateOutput_functor
diff --git a/lib/THCUNN/Threshold.cu b/lib/THCUNN/Threshold.cu
index 47fe794..e7757eb 100644
--- a/lib/THCUNN/Threshold.cu
+++ b/lib/THCUNN/Threshold.cu
@@ -1,6 +1,7 @@
 #include "THCUNN.h"
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename T>
 struct ThresholdUpdateOutput
diff --git a/lib/THCUNN/VolumetricReplicationPadding.cu b/lib/THCUNN/VolumetricReplicationPadding.cu
index cf3a0c4..bac505a 100644
--- a/lib/THCUNN/VolumetricReplicationPadding.cu
+++ b/lib/THCUNN/VolumetricReplicationPadding.cu
@@ -7,6 +7,7 @@
 #include "THCHalf.h"
 #include "THCHalfAutoNumerics.cuh"
 #include "THCAtomics.cuh"
+#include <THC/THCApply.cuh>
 
 template <typename Dtype>
 __global__ void VolumetricReplicationPadding_updateOutput(