Move src/common to src/webnn/common

Move src/webnn_wire to src/webnn/wire
Move src/webnn_native to webnn/native
Move src/include to include/
Move src/tests to src/webnn/tests

BUILD.gn

@@ -18,7 +18,7 @@ import("scripts/webnn_overrides_with_defaults.gni")
 
 group("all") {
   testonly = true
-  deps = [ "src/tests:webnn_tests" ]
+  deps = [ "src/webnn/tests:webnn_tests" ]
   if (webnn_standalone) {
     deps += [ "examples:webnn_samples" ]
   }

DEPS

@@ -243,7 +243,7 @@ hooks = [
     'name': 'download_dml_unpkg',
     'pattern': '.',
     'condition': 'checkout_win',
-    'action': ['python3', 'src/webnn_native/dml/deps/script/download_dml.py'],
+    'action': ['python3', 'src/webnn/native/dml/deps/script/download_dml.py'],
   }
 ]
 

examples/BUILD.gn

@@ -36,12 +36,12 @@ static_library("webnn_sample_utils") {
 
   # Export all of these as public deps so that `gn check` allows includes
   public_deps = [
-    "${webnn_root}/src/common",
-    "${webnn_root}/src/utils:webnn_utils",
+    "${webnn_root}/src/webnn:cpp",
     "${webnn_root}/src/webnn:webnn_proc",
-    "${webnn_root}/src/webnn:webnncpp",
-    "${webnn_root}/src/webnn_native",
-    "${webnn_root}/src/webnn_wire",
+    "${webnn_root}/src/webnn/common",
+    "${webnn_root}/src/webnn/native:webnn_native",
+    "${webnn_root}/src/webnn/utils:webnn_utils",
+    "${webnn_root}/src/webnn/wire:webnn_wire",
   ]
 
   defines = [
@@ -58,7 +58,7 @@ static_library("webnn_sample_utils") {
     ]
   }
 
-  public_configs = [ "${webnn_root}/src/common:dawn_internal" ]
+  public_configs = [ "${webnn_root}/src/webnn/common:internal_config" ]
   if (is_linux) {
     public_configs += [ "//build/config//gcc:rpath_for_built_shared_libraries" ]
   }

examples/SampleUtils.cpp

@@ -16,17 +16,17 @@
 
 #include "common/Assert.h"
 #include "common/Log.h"
-#include "utils/TerribleCommandBuffer.h"
-#include "webnn_native/NamedInputs.h"
-#include "webnn_native/NamedOperands.h"
-#include "webnn_native/NamedOutputs.h"
-
+#include "webnn/native/NamedInputs.h"
+#include "webnn/native/NamedOperands.h"
+#include "webnn/native/NamedOutputs.h"
+#include "webnn/utils/TerribleCommandBuffer.h"
+#include "webnn/wire/WireClient.h"
+#include "webnn/wire/WireServer.h"
+
+#include <webnn/native/WebnnNative.h>
 #include <webnn/webnn.h>
 #include <webnn/webnn_cpp.h>
 #include <webnn/webnn_proc.h>
-#include <webnn_native/WebnnNative.h>
-#include <webnn_wire/WireClient.h>
-#include <webnn_wire/WireServer.h>
 #include <algorithm>
 #include <cmath>
 #include <fstream>

examples/SqueezeNet/SqueezeNet.cpp

@@ -175,4 +175,4 @@ const wnn::Operand SqueezeNet::LoadNHWC(const wnn::GraphBuilder& builder, bool s
     const wnn::Operand reshape = builder.Reshape(averagePool2d, newShape.data(), newShape.size());
     const wnn::Operand output = softmax ? builder.Softmax(reshape) : reshape;
     return output;
-}
+}

generator/templates/webnn_native/ProcTable.cpp → generator/templates/webnn/native/ProcTable.cpp

@@ -13,15 +13,15 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "webnn_native/webnn_platform.h"
-#include "webnn_native/WebnnNative.h"
+#include "webnn/native/webnn_platform.h"
+#include "webnn/native/WebnnNative.h"
 
 #include <algorithm>
 #include <vector>
 
 {% for type in by_category["object"] %}
     {% if type.name.canonical_case() not in ["texture view"] %}
-        #include "webnn_native/{{type.name.CamelCase()}}.h"
+        #include "webnn/native/{{type.name.CamelCase()}}.h"
     {% endif %}
 {% endfor %}
 

generator/templates/webnn_native/ValidationUtils.cpp → generator/templates/webnn/native/ValidationUtils.cpp

@@ -13,7 +13,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "webnn_native/ValidationUtils_autogen.h"
+#include "webnn/native/ValidationUtils_autogen.h"
 
 namespace webnn::native {
 

generator/templates/webnn_native/ValidationUtils.h → generator/templates/webnn/native/ValidationUtils.h

@@ -18,7 +18,7 @@
 
 #include "webnn/webnn_cpp.h"
 
-#include "webnn_native/Error.h"
+#include "webnn/native/Error.h"
 
 namespace webnn::native {
 

generator/templates/webnn_native/webnn_platform.h → generator/templates/webnn/native/webnn_platform.h

@@ -16,7 +16,7 @@
 #define WEBNN_NATIVE_WEBNN_PLATFORM_AUTOGEN_H_
 
 #include "webnn/webnn_cpp.h"
-#include "webnn_native/Forward.h"
+#include "webnn/native/Forward.h"
 
 namespace webnn::native {
 
@@ -31,4 +31,4 @@ namespace webnn::native {
     {% endfor %}
 }
 
-#endif  // WEBNN_NATIVE_WEBNN_PLATFORM_AUTOGEN_H_
+#endif  // WEBNN_NATIVE_WEBNN_PLATFORM_AUTOGEN_H_

generator/templates/webnn_native/webnn_structs.cpp → generator/templates/webnn/native/webnn_structs.cpp

@@ -13,7 +13,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "webnn_native/webnn_structs_autogen.h"
+#include "webnn/native/webnn_structs_autogen.h"
 
 namespace webnn::native {
 

generator/templates/webnn_native/webnn_structs.h → generator/templates/webnn/native/webnn_structs.h

@@ -17,7 +17,7 @@
 #define WEBNN_NATIVE_WEBNN_STRUCTS_H_
 
 #include "webnn/webnn_cpp.h"
-#include "webnn_native/Forward.h"
+#include "webnn/native/Forward.h"
 
 namespace webnn::native {
 

generator/templates/webnn_wire/WireCmd.cpp → generator/templates/webnn/wire/WireCmd.cpp

@@ -13,10 +13,10 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "webnn_wire/WireCmd_autogen.h"
+#include "webnn/wire/WireCmd_autogen.h"
 
 #include "common/Assert.h"
-#include "webnn_wire/Wire.h"
+#include "webnn/wire/Wire.h"
 
 #include <algorithm>
 #include <cstring>

generator/templates/webnn_wire/WireCmd.h → generator/templates/webnn/wire/WireCmd.h

@@ -18,7 +18,7 @@
 
 #include <webnn/webnn.h>
 
-#include "webnn_wire/ObjectType_autogen.h"
+#include "webnn/wire/ObjectType_autogen.h"
 
 namespace webnn::wire {
 

generator/templates/webnn_wire/client/ApiObjects.h → generator/templates/webnn/wire/client/ApiObjects.h

@@ -16,8 +16,8 @@
 #ifndef WEBNNNWIRE_CLIENT_APIOBJECTS_AUTOGEN_H_
 #define WEBNNNWIRE_CLIENT_APIOBJECTS_AUTOGEN_H_
 
-#include "webnn_wire/ObjectType_autogen.h"
-#include "webnn_wire/client/ObjectBase.h"
+#include "webnn/wire/ObjectType_autogen.h"
+#include "webnn/wire/client/ObjectBase.h"
 
 namespace webnn::wire::client {
 

generator/templates/webnn_wire/client/ApiProcs.cpp → generator/templates/webnn/wire/client/ApiProcs.cpp

@@ -14,8 +14,8 @@
 //* limitations under the License.
 
 #include "common/Log.h"
-#include "webnn_wire/client/ApiObjects.h"
-#include "webnn_wire/client/Client.h"
+#include "webnn/wire/client/ApiObjects.h"
+#include "webnn/wire/client/Client.h"
 
 #include <algorithm>
 #include <cstring>

generator/templates/webnn_wire/client/ClientBase.h → generator/templates/webnn/wire/client/ClientBase.h

@@ -16,10 +16,10 @@
 #ifndef DAWNWIRE_CLIENT_CLIENTBASE_AUTOGEN_H_
 #define DAWNWIRE_CLIENT_CLIENTBASE_AUTOGEN_H_
 
-#include "webnn_wire/ChunkedCommandHandler.h"
-#include "webnn_wire/WireCmd_autogen.h"
-#include "webnn_wire/client/ApiObjects.h"
-#include "webnn_wire/client/ObjectAllocator.h"
+#include "webnn/wire/ChunkedCommandHandler.h"
+#include "webnn/wire/WireCmd_autogen.h"
+#include "webnn/wire/client/ApiObjects.h"
+#include "webnn/wire/client/ObjectAllocator.h"
 
 namespace webnn::wire::client {
 

generator/templates/webnn_wire/client/ClientHandlers.cpp → generator/templates/webnn/wire/client/ClientHandlers.cpp

@@ -14,7 +14,7 @@
 //* limitations under the License.
 
 #include "common/Assert.h"
-#include "webnn_wire/client/Client.h"
+#include "webnn/wire/client/Client.h"
 
 #include <string>
 

generator/templates/webnn_wire/server/ServerBase.h → generator/templates/webnn/wire/server/ServerBase.h

@@ -17,11 +17,11 @@
 #define WEBNNIRE_SERVER_SERVERBASE_H_
 
 #include "webnn/webnn_proc_table.h"
-#include "webnn_wire/ChunkedCommandHandler.h"
-#include "webnn_wire/Wire.h"
-#include "webnn_wire/WireCmd_autogen.h"
-#include "webnn_wire/WireDeserializeAllocator.h"
-#include "webnn_wire/server/ObjectStorage.h"
+#include "webnn/wire/ChunkedCommandHandler.h"
+#include "webnn/wire/Wire.h"
+#include "webnn/wire/WireCmd_autogen.h"
+#include "webnn/wire/WireDeserializeAllocator.h"
+#include "webnn/wire/server/ObjectStorage.h"
 
 namespace webnn::wire::server {
 

generator/templates/webnn_wire/server/ServerDoers.cpp → generator/templates/webnn/wire/server/ServerDoers.cpp

@@ -14,7 +14,7 @@
 //* limitations under the License.
 
 #include "common/Assert.h"
-#include "webnn_wire/server/Server.h"
+#include "webnn/wire/server/Server.h"
 
 namespace webnn::wire::server {
     //* Implementation of the command doers

generator/templates/webnn_wire/server/ServerHandlers.cpp → generator/templates/webnn/wire/server/ServerHandlers.cpp

@@ -13,7 +13,7 @@
 //* limitations under the License.
 
 #include "common/Assert.h"
-#include "webnn_wire/server/Server.h"
+#include "webnn/wire/server/Server.h"
 
 namespace webnn::wire::server {
     {% for command in cmd_records["command"] %}

generator/webnn_generator.gni

@@ -24,9 +24,9 @@ import("../scripts/webnn_overrides_with_defaults.gni")
 #  1. The generated output file directory structure has to match the structure
 #    of the source tree, starting at dawn_gen_root (gen/ or
 #    gen/third_party/dawn depending on where we are).
-#  2. src/include and dawn_gen_root/src/include has to match the structure of
+#  2. include and dawn_gen_root/include has to match the structure of
 #    the source tree too.
-#  3. Dawn files must use include relative to src/ or src/include such as
+#  3. Dawn files must use include relative to src/ or include such as
 #    "dawn/dawn.h" or "dawn_native/backend/BackendStuff.h".
 #
 # The allowed list below ensure 1). Include directory rules for Dawn ensure 3)
@@ -44,7 +44,7 @@ webnn_allowed_gen_output_dirs = [
   "src/webnn/wire/client/",
   "src/webnn/wire/server/",
   "src/webnn/wire/",
-  "src/include/webnn/",
+  "include/webnn/",
 ]
 
 # Template to help invoking Dawn code generators based on generator_lib