Update from upstream repo facebookresearch/TensorComprehensions@master

.circleci/config.yml

@@ -9,11 +9,11 @@ jobs:
     steps:
       - checkout
       - run:
-          name: conda_tapir_halide
+          name: conda_llvm_halide
           command: |
             . /opt/conda/anaconda/bin/activate
             source activate tc_build
-            conda install -y -c nicolasvasilache llvm-tapir50 halide
+            conda install -y -c nicolasvasilache llvm-trunk halide
 
       - run:
           name: check_formatting

.github/ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@ Tensor Comprehensions Github Issues Guidelines
 ----------------------------------------------
 
 If you have a feature request or a bug report (build issue), please open an issue on Github and fill the template below so we can help you better and faster. If you have some general
-questions about Tensor Comprehensions, please visit our [slack channel](https://tensorcomprehensions.herokuapp.com/) or email us at tensorcomp@fb.com
+questions about Tensor Comprehensions, please email us at tensorcomp@fb.com
 
 For build issues, please add `[Build]` at the beginning of issue title.
 
@@ -16,7 +16,7 @@ When submitting a bug report, please include the following information (where re
 - GCC/GXX version (if compiling from source):
 - LLVM/Tapir git hash used (if compiling from source):
 
-  To get the hash, run: `$HOME/clang+llvm-tapir5.0/bin/clang --version`
+  To get the hash, run: `$CONDA_PREFIX/bin/clang --version`
 
 - Commit hash of our repo and submodules (if compiling from source):
 

.gitignore

@@ -3,9 +3,6 @@ __pycache__/
 *~
 build/*
 docs/build/*
-tc/proto/*.py
-tc/proto/*.cc
-tc/proto/*.h
 third-party/*_cache
 third-party/llvm_sources*
 third-party-install/*
@@ -17,8 +14,6 @@ conda
 */.nfs*
 tensor_comprehensions.egg-info/
 tensor_comprehensions/version.py
-tensor_comprehensions/*.proto
-tensor_comprehensions/*_pb2.py
 slurm-*
 examples/results*
 *.pyc

.jenkins/build.sh

@@ -60,7 +60,7 @@ cd /var/lib/jenkins/workspace
 git submodule update --init --recursive
 
 source activate tc_build
-conda install -y -c nicolasvasilache llvm-tapir50 halide
+conda install -y -c nicolasvasilache llvm-trunk halide
 conda install -y -c conda-forge eigen
 conda install -y -c nicolasvasilache caffe2
 

CMakeLists.txt

@@ -139,9 +139,6 @@ if(WITH_CUDA)
   find_package(CUDA REQUIRED)
   include_directories(BEFORE ${CUDA_TOOLKIT_ROOT_DIR}/include)
 
-  # modified CUB
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_CUDA -DCUDA_HOME=\"\\\"${CUDA_INCLUDE_DIRS}\\\"\" -DCUB_HOME=\"\\\"${CUB_INSTALL_DIR}\\\"\" ")
-
   # Inherited from Torch, see
   # https://github.com/torch/cutorch/blob/master/lib/THC/cmake/select_compute_arch.cmake
   INCLUDE(cmake/select_compute_arch.cmake)
@@ -226,13 +223,11 @@ message(STATUS "Found ATen.so file: ${ATEN_LIBRARIES}")
 ################################################################################
 # isl
 ################################################################################
-set(ISL_INT "gmp" CACHE STRING "Which package to use to represent multi-precision integers (gmp|imath)")
 # use locally generated C++ bindings
 include_directories(AFTER ${PROJECT_SOURCE_DIR}/isl_interface/include)
 include_directories(AFTER ${PROJECT_SOURCE_DIR}/third-party/islpp/include)
 include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/third-party/islpp/include)
-add_subdirectory(third-party/islpp)
-set(ISL_LIBRARIES isl-static)
+add_subdirectory(external/isl)
 
 ################################################################################
 # Halide
@@ -261,6 +256,20 @@ include(cmake/GetGitRevisionDescription.cmake)
 ################################################################################
 # Finally, build
 ################################################################################
+# Variables for tc_config.h.in
+set(TC_DIR ${TC_DIR})
+execute_process(COMMAND ${CLANG_PREFIX}/bin/llvm-config --bindir  OUTPUT_VARIABLE LLVM_BIN_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(TC_LLVM_BIN_DIR ${LLVM_BIN_DIR})
+if (WITH_CUDA)
+   # CUDA-specific variables for tc_config.h.in
+   set(TC_WITH_CUDA 1)
+   set(TC_CUB_INCLUDE_DIR ${CUB_INSTALL_DIR})
+   set(TC_CUDA_TOOLKIT_ROOT_DIR ${CUDA_TOOLKIT_ROOT_DIR})
+   set(TC_CUDA_INCLUDE_DIR ${CUDA_INCLUDE_DIRS})
+else()
+   set(TC_WITH_CUDA 0)
+endif()
+configure_file("tc/tc_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/tc/tc_config.h")
 
 ################################################################################
 # Compile flags
@@ -283,13 +292,12 @@ elseif(${CMAKE_BUILD_TYPE} MATCHES "Release")
 endif()
 message(STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX}")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTC_DIR=\"\\\"${TC_DIR}\\\"\" ")
-
 include_directories(BEFORE ${PROJECT_SOURCE_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 add_subdirectory(tc)
 
 # At the moment pybind is only supported in CUDA mode and compilation fails
-# for non-CUDA mode (CUDA_HOME and CUB_HOME undefined error).
+# for non-CUDA mode (CUDA_INCLUDE_DIR and CUB_INCLUDE_DIR undefined error).
 # Once the core CPU mapper is stabilized we can worry about pybind, deactivate
 # conditionally for now
 if (WITH_CUDA)

README.md

@@ -29,7 +29,7 @@ After a few generations of `autotuning` on a 2-GPU P100 system, we see results r
 
 ![Autotuning Sample](docs/source/_static/img/autotuning.png)
 
-In C++ a minimal autotuning example resembles the [following](example/example_tensordot.cc):
+In C++ a minimal autotuning example resembles the [following](tc/examples/tensordot.cc):
 ```cpp
 TEST(TensorDot, SimpleAutotune) {
   // 1. Define and setup the TC compilation unit with CUDA memory
@@ -131,7 +131,6 @@ You can find documentation [here](https://facebookresearch.github.io/TensorCompr
 
 * **Email**: tensorcomp@fb.com
 * **GitHub issues**: bug reports, feature requests, install issues, RFCs, thoughts, etc.
-* **Slack**: For discussion around framework integration, build support, collaboration, etc. join our slack channel https://tensorcomprehensions.herokuapp.com/.
 
 # Code of Conduct
 See the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file for more details.

build.sh

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #! /bin/bash
 set -ex
 

check_and_fix_format.sh

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #! /bin/bash
 
 CLANG=${CLANG:=clang-format-4.0}

cmake/FindCuDNN.cmake

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 # Taken from Caffe2
 
 # - Try to find cuDNN
@@ -52,4 +66,4 @@ if(CUDNN_FOUND)
   set(CUDNN_LIBRARIES ${CUDNN_LIBRARY})
   message(STATUS "Found cuDNN: v${CUDNN_VERSION}  (include: ${CUDNN_INCLUDE_DIR}, library: ${CUDNN_LIBRARY})")
   mark_as_advanced(CUDNN_ROOT_DIR CUDNN_LIBRARY CUDNN_INCLUDE_DIR)
-endif()
+endif()

cmake/GetGitRevisionDescription.cmake

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 # - Returns a version string from Git
 #
 # These functions force a re-configure on each git commit so that you can

cmake/GetGitRevisionDescription.cmake.in

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #
 # Internal file for GetGitRevisionDescription.cmake
 #

cmake/select_compute_arch.cmake

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 # Synopsis:
 #   CUDA_SELECT_NVCC_ARCH_FLAGS(out_variable [target_CUDA_architectures])
 #   -- Selects GPU arch flags for nvcc based on target_CUDA_architectures
@@ -197,4 +211,4 @@ function(CUDA_SELECT_NVCC_ARCH_FLAGS out_variable)
   string(REPLACE ";" " " nvcc_archs_readable "${nvcc_archs_readable}")
   set(${out_variable}          ${nvcc_flags}          PARENT_SCOPE)
   set(${out_variable}_readable ${nvcc_archs_readable} PARENT_SCOPE)
-endfunction()
+endfunction()

conda_recipes/README.md

@@ -17,7 +17,7 @@ nvidia-docker run --rm -i -t tc-cuda9.0-cudnn7.1-ubuntu16.04-devel
 
 We are ready to build conda package for TC.
 To simplify the build process we ship TC dependencies as conda packages.
-We need to build packages for `llvm-tapir50`, `Halide`, `Caffe2` (optional) and finally `Tensor Comprehensions`.
+We need to build packages for `llvm-trunk`, `Halide`, `Caffe2` (optional) and finally `Tensor Comprehensions`.
 
 For building each package, we need to specify a `build version`, `build number` and
 `git hash`. This information is used to build each package.

conda_recipes/caffe2/build.sh

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #!/usr/bin/env bash
 
 set -e

conda_recipes/conda_build_tc.sh

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #!/usr/bin/env bash
 
 set -e
@@ -28,27 +42,31 @@ time conda build -c $ANACONDA_USER --python 3.6 caffe2
 echo "Caffe2 packaged Successfully"
 
 ###############################################################################
-# LLVM_TAPIR settings
-LLVM_TAPIR_BUILD_VERSION="1.0.0"
-LLVM_TAPIR_BUILD_NUMBER=1
-LLVM_TAPIR_GIT_HASH="1482504e234a65bffc8c54de8de9fc877822345d"
+# LLVM_TRUNK settings
+LLVM_TRUNK_BUILD_VERSION="1.0.0"
+LLVM_TRUNK_BUILD_NUMBER=1
+LLVM_TRUNK_SOURCE_DIR=$(mktemp -d /tmp/d.XXXXXX)
+trap 'rm -rf "${LLVM_TRUNK_SOURCE_DIR}"' EXIT
+
+svn co http://llvm.org/svn/llvm-project/llvm/trunk ${LLVM_TRUNK_SOURCE_DIR}
+svn co http://llvm.org/svn/llvm-project/cfe/trunk ${LLVM_TRUNK_SOURCE_DIR}/tools/clang
 
-echo "Building llvm-tapir50"
-echo "LLVM_TAPIR_BUILD_VERSION: $LLVM_TAPIR_BUILD_VERSION LLVM_TAPIR_BUILD_NUMBER: ${LLVM_TAPIR_BUILD_NUMBER}"
+echo "Building llvm-trunk"
+echo "LLVM_TRUNK_BUILD_VERSION: $LLVM_TRUNK_BUILD_VERSION LLVM_TRUNK_BUILD_NUMBER: ${LLVM_TRUNK_BUILD_NUMBER}"
 
-export LLVM_TAPIR_BUILD_VERSION=$LLVM_TAPIR_BUILD_VERSION
-export LLVM_TAPIR_BUILD_NUMBER=$LLVM_TAPIR_BUILD_NUMBER
-export LLVM_TAPIR_GIT_HASH=$LLVM_TAPIR_GIT_HASH
+export LLVM_TRUNK_BUILD_VERSION=$LLVM_TRUNK_BUILD_VERSION
+export LLVM_TRUNK_BUILD_NUMBER=$LLVM_TRUNK_BUILD_NUMBER
+export LLVM_TRUNK_SOURCE_DIR=$LLVM_TRUNK_SOURCE_DIR
 
-time conda build -c $ANACONDA_USER --python 3.6 llvm-tapir50
+time conda build -c $ANACONDA_USER --python 3.6 llvm-trunk
 
-echo "llvm-tapir50 packaged Successfully"
+echo "llvm-trunk packaged Successfully"
 
 ##############################################################################
 # Halide settings
 HALIDE_BUILD_VERSION="1.0.0"
-HALIDE_BUILD_NUMBER=0
-HALIDE_GIT_HASH="35be67b3a3e4c4461f79949109ff35c54cf307de"
+HALIDE_BUILD_NUMBER=1
+HALIDE_GIT_HASH="0b29cacf636852933892bbaa61dd2050c8dcaff2"
 
 echo "Packaging HALIDE ==> HALIDE_BUILD_VERSION: ${HALIDE_BUILD_VERSION} HALIDE_BUILD_NUMBER: ${HALIDE_BUILD_NUMBER}"
 
@@ -75,4 +93,3 @@ echo "HALIDE packaged Successfully"
 #time conda build -c $ANACONDA_USER --python 3.6 tensor_comprehensions
 #
 #echo "Tensor Comprehensions packaged Successfully"
-#

conda_recipes/halide/build.sh

@@ -1,3 +1,17 @@
+# Copyright (c) 2017-present, Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
 #!/usr/bin/env bash
 
 set -e

conda_recipes/halide/meta.yaml

@@ -8,10 +8,10 @@ source:
 
 requirements:
   build:
-    - llvm-tapir50==1.0.0
+    - llvm-trunk==1.0.0
     - cmake
   run:
-    - llvm-tapir50==1.0.0
+    - llvm-trunk==1.0.0
     - cmake
 
 build: