Fix torch compile issue

torch/cutorch#797
ufoym · Feb 13, 2018 · 972a771 · 972a771
1 parent 5e6f47d
commit 972a771
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 0 deletions.
diff --git a/docker/Dockerfile.all-py27 b/docker/Dockerfile.all-py27
@@ -65,6 +65,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py27-cpu b/docker/Dockerfile.all-py27-cpu
@@ -65,6 +65,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py27-jupyter b/docker/Dockerfile.all-py27-jupyter
@@ -66,6 +66,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py27-jupyter-cpu b/docker/Dockerfile.all-py27-jupyter-cpu
@@ -66,6 +66,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py36 b/docker/Dockerfile.all-py36
@@ -74,6 +74,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py36-cpu b/docker/Dockerfile.all-py36-cpu
@@ -74,6 +74,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py36-jupyter b/docker/Dockerfile.all-py36-jupyter
@@ -75,6 +75,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.all-py36-jupyter-cpu b/docker/Dockerfile.all-py36-jupyter-cpu
@@ -75,6 +75,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.torch b/docker/Dockerfile.torch
@@ -32,6 +32,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/docker/Dockerfile.torch-cpu b/docker/Dockerfile.torch-cpu
@@ -32,6 +32,7 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # torch
 # ------------------------------------------------------------------
 
+    export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
     $GIT_CLONE https://github.com/torch/distro.git ~/torch --recursive && \
 
     cd ~/torch/exe/luajit-rocks && \

diff --git a/generator/modules/torch.py b/generator/modules/torch.py
@@ -9,6 +9,7 @@ class Torch(Module):
 
     def build(self):
         return r'''
+            export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
             $GIT_CLONE https://github.com/torch/distro.git ~/torch''' \
         + r''' --recursive && \