Merge branch 'main' into fixSKIPbug

Author: yangw-dev

examples/demo-apps/android/ExecuTorchDemo/app/src/main/java/com/example/executorchdemo/MainActivity.java

@@ -97,13 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
       finish();
     }
 
-    try {
-      mModule = Module.load("/data/local/tmp/dl3_xnnpack_fp32.pte");
-
-    } catch (IOException e) {
-      Log.e("ImageSegmentation", "Error reading assets", e);
-      finish();
-    }
+    mModule = Module.load("/data/local/tmp/dl3_xnnpack_fp32.pte");
 
     mImageView = findViewById(R.id.imageView);
     mImageView.setImageBitmap(mBitmap);
@@ -129,14 +123,8 @@ public void onClick(View v) {
     mButtonXnnpack.setOnClickListener(
         new View.OnClickListener() {
           public void onClick(View v) {
-            try {
-              mModule.destroy();
-              mModule = Module.load("/data/local/tmp/dl3_xnnpack_fp32.pte");
-            } catch (IOException e) {
-              Log.e("ImageSegmentation", "Error reading assets", e);
-              finish();
-            }
-
+            mModule.destroy();
+            mModule = Module.load("/data/local/tmp/dl3_xnnpack_fp32.pte");
             mButtonXnnpack.setEnabled(false);
             mProgressBar.setVisibility(ProgressBar.VISIBLE);
             mButtonXnnpack.setText(getString(R.string.run_model));
@@ -149,13 +137,8 @@ public void onClick(View v) {
     mButtonHtp.setOnClickListener(
         new View.OnClickListener() {
           public void onClick(View v) {
-            try {
-              mModule.destroy();
-              mModule = Module.load("/data/local/tmp/dlv3_qnn.pte");
-            } catch (IOException e) {
-              Log.e("ImageSegmentation", "Error reading assets", e);
-              finish();
-            }
+            mModule.destroy();
+            mModule = Module.load("/data/local/tmp/dlv3_qnn.pte");
             mButtonHtp.setEnabled(false);
             mProgressBar.setVisibility(ProgressBar.VISIBLE);
             mButtonHtp.setText(getString(R.string.run_model));

kernels/portable/cpu/op_unfold_copy.cpp

@@ -11,7 +11,7 @@ using Tensor = executorch::aten::Tensor;
 
 // unfold_copy(Tensor self, int dimension, int size, int step, *, Tensor(a!)
 // out) -> Tensor(a!)
-Tensor unfold_copy_out(
+Tensor& unfold_copy_out(
     KernelRuntimeContext& ctx,
     const Tensor& self,
     int64_t dim,

shim_et/xplat/executorch/build/runtime_wrapper.bzl

@@ -187,6 +187,9 @@ def _patch_kwargs_common(kwargs):
     for dep_type in ("deps", "exported_deps"):
         env.patch_deps(kwargs, dep_type)
 
+    if "visibility" not in kwargs:
+        kwargs["visibility"] = ["//executorch/..."]
+
     # Patch up references to "//executorch/..." in lists of build targets,
     # if necessary.
     use_static_deps = kwargs.pop("use_static_deps", False)
@@ -202,10 +205,6 @@ def _patch_kwargs_common(kwargs):
                 function = native.partial(_patch_executorch_references, use_static_deps = use_static_deps),
             )
 
-    # Make all targets private by default, like in xplat.
-    if "visibility" not in kwargs:
-        kwargs["visibility"] = []
-
     # If we see certain strings in the "visibility" list, expand them.
     if "@EXECUTORCH_CLIENTS" in kwargs["visibility"]:
         # See env.executorch_clients for this list.