Update

[ghstack-poisoned]

Author: swolchok

.gitmodules

@@ -70,3 +70,6 @@
 [submodule "third-party/pocketfft"]
 	path = third-party/pocketfft
 	url = https://github.com/mreineck/pocketfft
+[submodule "shim"]
+	path = shim
+	url = https://github.com/facebook/buck2-shims-meta

build/build_android_llm_demo.sh

@@ -40,7 +40,7 @@ build_android_native_library() {
     EXECUTORCH_BUILD_NEURON=OFF
   fi
 
-  cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
+  cmake --trace . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
     -DANDROID_ABI="${ANDROID_ABI}" \
     -DANDROID_PLATFORM=android-26 \
@@ -69,7 +69,7 @@ build_android_native_library() {
   fi
   cmake --build "${CMAKE_OUT}" -j "${CMAKE_JOBS}" --target install --config "${EXECUTORCH_CMAKE_BUILD_TYPE}"
 
-  cmake extension/android \
+  cmake --trace extension/android \
     -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
     -DANDROID_ABI="${ANDROID_ABI}" \
     -DANDROID_PLATFORM=android-26 \

extension/android_test/setup.sh

@@ -18,7 +18,7 @@ build_native_library() {
   CMAKE_OUT="cmake-out-android-${ANDROID_ABI}"
   ANDROID_NDK="${ANDROID_NDK:-/opt/ndk}"
   EXECUTORCH_CMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE:-Release}"
-  cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
+  cmake --trace . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
     -DANDROID_ABI="${ANDROID_ABI}" \
     -DEXECUTORCH_BUILD_XNNPACK=ON \

runtime/core/portable_type/c10/c10/util/irange.h

@@ -24,28 +24,28 @@ struct integer_iterator {
   using pointer = I*;
   using reference = I&;
 
-  explicit integer_iterator(I value) : value(value) {}
+  explicit constexpr integer_iterator(I value) : value(value) {}
 
-  I operator*() const {
+  constexpr I operator*() const {
     return value;
   }
 
-  I const* operator->() const {
+  constexpr I const* operator->() const {
     return &value;
   }
 
-  integer_iterator& operator++() {
+  constexpr integer_iterator& operator++() {
     ++value;
     return *this;
   }
 
-  integer_iterator operator++(int) {
+  constexpr integer_iterator operator++(int) {
     const auto copy = *this;
     ++*this;
     return copy;
   }
 
-  bool operator==(const integer_iterator& other) const {
+  constexpr bool operator==(const integer_iterator& other) const {
     if constexpr (one_sided) {
       // Range-for loops' end test is `begin != end`, not `begin <
       // end`. To handle `c10::irange(n)` where n < 0 (which should be
@@ -64,7 +64,7 @@ struct integer_iterator {
     return false; // Horrible hack
   }
 
-  bool operator!=(const integer_iterator& other) const {
+  constexpr bool operator!=(const integer_iterator& other) const {
     return !(*this == other);
   }
 
@@ -80,12 +80,12 @@ template <
     std::enable_if_t<std::is_integral_v<I>, bool> = true>
 struct integer_range {
  public:
-  integer_range(I begin, I end) : begin_(begin), end_(end) {}
+  constexpr integer_range(I begin, I end) : begin_(begin), end_(end) {}
   using iterator = detail::integer_iterator<I, one_sided>;
-  iterator begin() const {
+  constexpr iterator begin() const {
     return begin_;
   }
-  iterator end() const {
+  constexpr iterator end() const {
     return end_;
   }
 
@@ -116,7 +116,7 @@ integer_range<Integer2> irange(Integer1 begin, Integer2 end) {
 template <
     typename Integer,
     std::enable_if_t<std::is_integral_v<Integer>, bool> = true>
-integer_range<Integer, true> irange(Integer end) {
+constexpr integer_range<Integer, true> irange(Integer end) {
   return {Integer(), end};
 }