Update

[ghstack-poisoned]

Author: swolchok

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1 +1 @@
-27e35de6c288bffad1b4d18b393579c1d1a95547
+08434df1f2f88c9770e59246caa2ff9c6f613270

build/cmake_deps.toml

@@ -130,6 +130,7 @@ excludes = [
 deps = [
   "executorch_core",
   "executorch",
+  "extension_threadpool",
 ]
 
 [targets.optimized_native_cpu_ops]
@@ -363,6 +364,7 @@ excludes = [
 deps = [
   "executorch",
   "executorch_core",
+  "extension_threadpool",
   "xnnpack_backend",
   "portable_kernels",
 ]
@@ -449,6 +451,7 @@ deps = [
   "executorch_core",
   "extension_data_loader",
   "extension_module",
+  "extension_threadpool",
   "portable_kernels",
   "quantized_kernels",
   "xnnpack_backend",

build/test_android_ci.sh

@@ -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));

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file ensures that mman.h compatible functions are defined in the global
+// namespace for windows and posix environments.
+
+#pragma once
+
+#include <executorch/runtime/platform/compiler.h>
+
+#ifndef _WIN32
+
+#include <sys/mman.h>
+#include <unistd.h>
+
+ET_INLINE size_t get_os_page_size() {
+  return sysconf(_SC_PAGESIZE);
+}
+
+#else
+
+#define NOMINMAX
+#include <windows.h>
+#undef NOMINMAX
+#include <io.h>
+
+#include <executorch/extension/data_loader/mman_windows.h>
+
+ET_INLINE long get_os_page_size() {
+  SYSTEM_INFO si;
+  GetSystemInfo(&si);
+  long pagesize = si.dwAllocationGranularity > si.dwPageSize
+      ? si.dwAllocationGranularity
+      : si.dwPageSize;
+  return pagesize;
+}
+
+#endif