Making the Sampler::reset to accept a new size

.gitignore

@@ -192,6 +192,9 @@ MANIFEST-*
 # generated version file
 caffe2/version.py
 
+# generated caffe2 docs
+docs/caffe2/
+
 # setup.py intermediates
 .eggs
 caffe2.egg-info
@@ -221,3 +224,6 @@ TAGS
 # Files generated when a patch is rejected
 *.orig
 *.rej
+
+# virtual environments
+venv/

.jenkins/caffe2/build.sh

@@ -92,7 +92,7 @@ fi
 
 
 ###############################################################################
-# Use special scripts for Android, conda, and setup builds
+# Use special scripts for Android and setup builds
 ###############################################################################
 if [[ "${BUILD_ENVIRONMENT}" == *-android* ]]; then
   export ANDROID_NDK=/opt/ndk
@@ -102,19 +102,6 @@ if [[ "${BUILD_ENVIRONMENT}" == *-android* ]]; then
   CMAKE_ARGS+=("-DUSE_ZSTD=ON")
   "${ROOT_DIR}/scripts/build_android.sh" ${CMAKE_ARGS[*]} "$@"
   exit 0
-elif [[ "${BUILD_ENVIRONMENT}" == conda* ]]; then
-  "${ROOT_DIR}/scripts/build_anaconda.sh" --skip-tests --install-locally "$@"
-  report_compile_cache_stats
-
-  # This build will be tested against onnx tests, which needs onnx installed.
-  # At this point the visible protbuf installation will be in conda, since one
-  # of Caffe2's dependencies uses conda, so the correct protobuf include
-  # headers are those in conda as well
-  # This path comes from install_anaconda.sh which installs Anaconda into the
-  # docker image
-  PROTOBUF_INCDIR=/opt/conda/include pip install -b /tmp/pip_install_onnx "file://${ROOT_DIR}/third_party/onnx#egg=onnx"
-  report_compile_cache_stats
-  exit 0
 fi
 
 

.jenkins/caffe2/test.sh

@@ -15,14 +15,6 @@ fi
 # The prefix must mirror the setting from build.sh
 INSTALL_PREFIX="/usr/local/caffe2"
 
-# Anaconda builds have a special install prefix and python
-if [[ "$BUILD_ENVIRONMENT" == conda* ]]; then
-  # This path comes from install_anaconda.sh which installs Anaconda into the
-  # docker image
-  PYTHON="/opt/conda/bin/python"
-  INSTALL_PREFIX="/opt/conda/"
-fi
-
 # Add the site-packages in the caffe2 install prefix to the PYTHONPATH
 SITE_DIR=$($PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))")
 INSTALL_SITE_DIR="${INSTALL_PREFIX}/${SITE_DIR}"
@@ -34,11 +26,9 @@ if [[ "${BUILD_ENVIRONMENT}" == *-android* ]]; then
 fi
 
 # Set PYTHONPATH and LD_LIBRARY_PATH so that python can find the installed
-# Caffe2. This shouldn't be done on Anaconda, as Anaconda should handle this.
-if [[ "$BUILD_ENVIRONMENT" != conda* ]]; then
-  export PYTHONPATH="${PYTHONPATH}:$INSTALL_SITE_DIR"
-  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib"
-fi
+# Caffe2.
+export PYTHONPATH="${PYTHONPATH}:$INSTALL_SITE_DIR"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib"
 
 cd "$ROOT_DIR"
 
@@ -97,13 +87,6 @@ if [[ "$BUILD_ENVIRONMENT" == *-cuda* ]]; then
   EXTRA_TESTS+=("$CAFFE2_PYPATH/contrib/nccl")
 fi
 
-conda_ignore_test=()
-if [[ $BUILD_ENVIRONMENT == conda* ]]; then
-  # These tests both assume Caffe2 was built with leveldb, which is not the case
-  conda_ignore_test+=("--ignore $CAFFE2_PYPATH/python/dataio_test.py")
-  conda_ignore_test+=("--ignore $CAFFE2_PYPATH/python/operator_test/checkpoint_test.py")
-fi
-
 rocm_ignore_test=()
 if [[ $BUILD_ENVIRONMENT == *-rocm* ]]; then
   # Currently these tests are failing on ROCM platform:
@@ -130,7 +113,6 @@ pip install --user pytest-sugar
   --ignore "$CAFFE2_PYPATH/python/operator_test/matmul_op_test.py" \
   --ignore "$CAFFE2_PYPATH/python/operator_test/pack_ops_test.py" \
   --ignore "$CAFFE2_PYPATH/python/mkl/mkl_sbn_speed_test.py" \
-  ${conda_ignore_test[@]} \
   ${rocm_ignore_test[@]} \
   "$CAFFE2_PYPATH/python" \
   "${EXTRA_TESTS[@]}"

.jenkins/pytorch/win-build.sh

@@ -99,8 +99,10 @@ if "%REBUILD%"=="" (
 :: Install ninja
 if "%REBUILD%"=="" ( pip install ninja )
 
+set WORKING_DIR=%CD%
 call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
 call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x86_amd64
+cd %WORKING_DIR%
 
 git submodule update --init --recursive
 

.jenkins/pytorch/win-test.sh

@@ -56,7 +56,9 @@ if NOT "%BUILD_ENVIRONMENT%"=="" (
 )
 pip install ninja future hypothesis
 
+set WORKING_DIR=%CD%
 call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x86_amd64
+cd %WORKING_DIR%
 
 set PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.0\\bin;C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.0\\libnvvp;%PATH%
 set CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.0

.travis.yml

@@ -27,7 +27,10 @@ matrix:
         install: pip install mypy mypy-extensions
         script: mypy @mypy-files.txt
       - env: CPP_DOC_CHECK
-        install: sudo apt-get install -y doxygen
+        python: "3.6"
+        install: 
+          - sudo apt-get install -y doxygen
+          - pip install -r requirements.txt
         script: cd docs/cpp/source && ./check-doxygen.sh
       - env: CLANG_TIDY
         python: "3.6"

CONTRIBUTING.md

@@ -412,7 +412,7 @@ Here are a few well known pitfalls and workarounds:
   * The idiom `static_assert(f() == f())` to test if `f` is constexpr
     does not work; you'll get "error C2131: expression did not evaluate
     to a constant".  Don't use these asserts on Windows.
-    (Example: `aten/src/ATen/core/intrusive_ptr.h`)
+    (Example: `c10/util/intrusive_ptr.h`)
 
 * (NVCC) Code you access inside a `static_assert` will eagerly be
   evaluated as if it were device code, and so you might get an error

aten/src/ATen/ATen.h

@@ -19,7 +19,7 @@
 #include "ATen/core/Generator.h"
 #include "ATen/core/Layout.h"
 #include "ATen/core/Scalar.h"
-#include "ATen/core/Storage.h"
+#include "c10/core/Storage.h"
 #include "ATen/core/TensorMethods.h"
 #include "ATen/core/TensorOptions.h"
 #include "c10/util/Exception.h"

aten/src/ATen/AccumulateType.h

@@ -6,17 +6,20 @@
 // Example:
 //   using accscalar_t = acc_type<scalar_t, true>;
 
-#ifdef __CUDACC__
+#if defined(__CUDACC__)
 #include <cuda.h>
 #include <cuda_fp16.h>
+#elif defined(__HIPCC__)
+#include <hip/hip_runtime.h>
+#include <hip/hip_fp16.h>
 #endif
 
 namespace at {
 
 template <typename T, bool is_cuda>
 struct AccumulateType { };
 
-#ifdef __CUDACC__
+#if defined(__CUDACC__) || defined(__HIPCC__)
 template <> struct AccumulateType<half, true> { using type = float; };
 #endif
 template <> struct AccumulateType<Half, true> { using type = float; };

aten/src/ATen/Allocator.h

@@ -1,2 +1,2 @@
 #pragma once
-#include <ATen/core/Allocator.h>
+#include <c10/core/Allocator.h>

aten/src/ATen/DeviceGuard.h

@@ -2,7 +2,7 @@
 
 #include <c10/DeviceGuard.h>
 #include <ATen/core/Tensor.h>
-#include <ATen/core/ScalarType.h> // TensorList whyyyyy
+#include <c10/core/ScalarType.h> // TensorList whyyyyy
 
 namespace at {
 

aten/src/ATen/InferSize.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/ScalarType.h>
+#include <c10/core/ScalarType.h>
 #include <c10/util/Optional.h>
 #include <sstream>
 #include <vector>

aten/src/ATen/ScalarOps.h

@@ -1,18 +1,19 @@
 #pragma once
 
-#include "ATen/core/Scalar.h"
+#include <c10/core/Scalar.h>
 #include "ATen/Tensor.h"
 
-namespace at {
+// This is in the c10 namespace because we use ADL to find the functions in it.
+namespace c10 {
 
 // FIXME: this should be (and was) Scalar::toTensor, but there is currently no way
 // to implement this without going through Derived Types (which are not part of core).
-inline Tensor scalar_to_tensor(Scalar s) {
+inline at::Tensor scalar_to_tensor(Scalar s) {
   if (s.isFloatingPoint()) {
-    return CPU(kDouble).scalarTensor(s);
+    return at::CPU(kDouble).scalarTensor(s);
   } else {
     AT_ASSERT(s.isIntegral());
-    return CPU(kLong).scalarTensor(s);
+    return at::CPU(kLong).scalarTensor(s);
   }
 }
 

aten/src/ATen/ScalarType.h

@@ -1,4 +1,4 @@
 #pragma once
 #include <ATen/core/ATenGeneral.h> // for BC reasons
 #include <ATen/core/Backend.h>
-#include <ATen/core/ScalarType.h>
+#include <c10/core/ScalarType.h>

aten/src/ATen/Storage.h

@@ -1,2 +1,2 @@
 #pragma once
-#include <ATen/core/Storage.h>
+#include <c10/core/Storage.h>

aten/src/ATen/TensorOperators.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ATen/core/Scalar.h"
+#include <c10/core/Scalar.h>
 #include "ATen/Tensor.h"
 #include "ATen/Type.h"
 

aten/src/ATen/Utils.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "ATen/core/ATenGeneral.h"
-#include "ATen/core/StorageImpl.h"
+#include <c10/core/StorageImpl.h>
 #include "ATen/core/UndefinedTensorImpl.h"
 
-#include <ATen/core/ScalarType.h>
+#include <c10/core/ScalarType.h>
 #include "ATen/Formatting.h"
 #include <c10/util/ArrayRef.h>
-#include "c10/util/Exception.h"
+#include <c10/util/Exception.h>
 
 #include <algorithm>
 #include <sstream>