Update base for Update on "decompose con1d to conv2d for cuda backend"

this diff decomposed conv1d into conv2d for aoti-cuda backend support

Differential Revision: [D84296877](https://our.internmc.facebook.com/intern/diff/D84296877/)

[ghstack-poisoned]

Author: Gasoonjia

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1 +1 @@
-7d06d03434c7c8de8fe1a432ee454b953f84ab0d
+53a2908a10f414a2f85caa06703a26a40e873869

CMakeLists.txt

@@ -889,21 +889,16 @@ if(EXECUTORCH_BUILD_PYBIND)
 
   # Set RPATH to find PyTorch libraries relative to the installation location
   # This goes from executorch/extension/pybindings up to site-packages, then to
-  # torch/lib Note: We disable CMAKE_INSTALL_RPATH_USE_LINK_PATH for this target
-  # to avoid duplicate RPATHs that can occur with recent PyTorch versions
+  # torch/lib
   if(APPLE)
     set_target_properties(
-      portable_lib
-      PROPERTIES BUILD_RPATH "@loader_path/../../../torch/lib"
-                 INSTALL_RPATH "@loader_path/../../../torch/lib"
-                 INSTALL_RPATH_USE_LINK_PATH OFF
+      portable_lib PROPERTIES BUILD_RPATH "@loader_path/../../../torch/lib"
+                              INSTALL_RPATH "@loader_path/../../../torch/lib"
     )
   else()
     set_target_properties(
-      portable_lib
-      PROPERTIES BUILD_RPATH "$ORIGIN/../../../torch/lib"
-                 INSTALL_RPATH "$ORIGIN/../../../torch/lib"
-                 INSTALL_RPATH_USE_LINK_PATH OFF
+      portable_lib PROPERTIES BUILD_RPATH "$ORIGIN/../../../torch/lib"
+                              INSTALL_RPATH "$ORIGIN/../../../torch/lib"
     )
   endif()
 

install_requirements.py

@@ -12,12 +12,33 @@
 
 from install_utils import determine_torch_url, is_intel_mac_os, python_is_compatible
 
-from torch_pin import NIGHTLY_VERSION, SUPPORTED_CUDA_VERSIONS, TORCH_VERSION
+from torch_pin import NIGHTLY_VERSION, TORCH_VERSION
 
 # The pip repository that hosts nightly torch packages.
 # This will be dynamically set based on CUDA availability and CUDA backend enabled/disabled.
 TORCH_NIGHTLY_URL_BASE = "https://download.pytorch.org/whl/nightly"
 
+# Supported CUDA versions - modify this to add/remove supported versions
+# Format: tuple of (major, minor) version numbers
+SUPPORTED_CUDA_VERSIONS = (
+    (12, 6),
+    (12, 8),
+    (13, 0),
+)
+
+# Since ExecuTorch often uses main-branch features of pytorch, only the nightly
+# pip versions will have the required features.
+#
+# NOTE: If a newly-fetched version of the executorch repo changes the value of
+# NIGHTLY_VERSION, you should re-run this script to install the necessary
+# package versions.
+#
+# NOTE: If you're changing, make the corresponding change in .ci/docker/ci_commit_pins/pytorch.txt
+# by picking the hash from the same date in https://hud.pytorch.org/hud/pytorch/pytorch/nightly/
+#
+# NOTE: If you're changing, make the corresponding supported CUDA versions in
+# SUPPORTED_CUDA_VERSIONS above if needed.
+
 
 def install_requirements(use_pytorch_nightly):
     # Skip pip install on Intel macOS if using nightly.

runtime/core/portable_type/c10/torch/headeronly/macros/Macros.h

@@ -359,7 +359,6 @@ static inline int C10_WARP_SIZE_INTERNAL() {
 // Those platforms do not support assert()
 #define CUDA_KERNEL_ASSERT(cond)
 #define CUDA_KERNEL_ASSERT_MSG(cond, msg)
-#define CUDA_KERNEL_ASSERT_PRINTF(cond, msg, ...)
 #define SYCL_KERNEL_ASSERT(cond)
 #elif defined(_MSC_VER)
 #if defined(NDEBUG)
@@ -397,26 +396,6 @@ __host__ __device__
                static_cast<unsigned>(__LINE__)), \
            0);                                   \
   }
-#define CUDA_KERNEL_ASSERT_PRINTF(cond, msg, ...)                     \
-  if (C10_UNLIKELY(!(cond))) {                                        \
-    (void)(printf(                                                    \
-        "[CUDA_KERNEL_ASSERT] " __FILE__ ":" C10_STRINGIZE(           \
-            __LINE__) ": %s: block: [%d,%d,%d], thread: [%d,%d,%d]: " \
-                      "Assertion failed: `" #cond "`: " msg "\n",     \
-        __func__,                                                     \
-        blockIdx.x,                                                   \
-        blockIdx.y,                                                   \
-        blockIdx.z,                                                   \
-        threadIdx.x,                                                  \
-        threadIdx.y,                                                  \
-        threadIdx.z,                                                  \
-        ##__VA_ARGS__));                                              \
-    (void)(_wassert(                                                  \
-               _CRT_WIDE(#cond),                                      \
-               _CRT_WIDE(__FILE__),                                   \
-               static_cast<unsigned>(__LINE__)),                      \
-           0);                                                        \
-  }
 #define SYCL_KERNEL_ASSERT(cond)                 \
   if (C10_UNLIKELY(!(cond))) {                   \
     (void)(_wassert(                             \
@@ -476,10 +455,6 @@ __host__ __device__
   if C10_UNLIKELY (!(cond)) {             \
     abort();                              \
   }
-#define CUDA_KERNEL_ASSERT_PRINTF(cond, msg, ...) \
-  if C10_UNLIKELY (!(cond)) {                     \
-    abort();                                      \
-  }
 #define SYCL_KERNEL_ASSERT(cond) \
   if C10_UNLIKELY (!(cond)) {    \
     abort();                     \
@@ -495,23 +470,6 @@ __host__ __device__
     __assert_fail(                                                     \
         msg, __FILE__, static_cast<unsigned int>(__LINE__), __func__); \
   }
-#define CUDA_KERNEL_ASSERT_PRINTF(cond, msg, ...)                        \
-  if (C10_UNLIKELY(!(cond))) {                                           \
-    printf(                                                            \
-        "[CUDA_KERNEL_ASSERT] " __FILE__ ":" C10_STRINGIZE(            \
-            __LINE__) ": %s: block: [%d,%d,%d], thread: [%d,%d,%d]: "  \
-            "Assertion failed: `" #cond "`: " msg "\n",                \
-        __func__,                                                      \
-        blockIdx.x,                                                    \
-        blockIdx.y,                                                    \
-        blockIdx.z,                                                    \
-        threadIdx.x,                                                   \
-        threadIdx.y,                                                   \
-        threadIdx.z,                                                   \
-        ##__VA_ARGS__); \
-    __assert_fail(                                                       \
-        #cond, __FILE__, static_cast<unsigned int>(__LINE__), __func__); \
-  }
 #define SYCL_KERNEL_ASSERT(cond)                                         \
   if (C10_UNLIKELY(!(cond))) {                                           \
     __assert_fail(                                                       \

torch_pin.py

@@ -1,19 +1,2 @@
-# Since ExecuTorch often uses main-branch features of pytorch, only the nightly
-# pip versions will have the required features.
-#
-# NOTE: If a newly-fetched version of the executorch repo changes the value of
-# NIGHTLY_VERSION, you should re-run install_executorch.sh script to install the necessary
-# package versions.
-#
-# NOTE: If you're changing, make the corresponding change in .ci/docker/ci_commit_pins/pytorch.txt
-# by picking the hash from the same date in https://hud.pytorch.org/hud/pytorch/pytorch/nightly/
-#
-# NOTE: If you're changing, make the corresponding supported CUDA versions in
-# SUPPORTED_CUDA_VERSIONS above if needed.
 TORCH_VERSION = "2.10.0"
-NIGHTLY_VERSION = "dev20251008"
-SUPPORTED_CUDA_VERSIONS = (
-    (12, 6),
-    (12, 8),
-    (13, 0),
-)
+NIGHTLY_VERSION = "dev20251003"