Skip to content
Open
2 changes: 1 addition & 1 deletion backends/aoti/common_shims_slim.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

#include <executorch/backends/aoti/export.h>
#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/runtime/core/error.h>
#include <cstdint>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <executorch/backends/aoti/slim/c10/core/Device.h>
#include <executorch/backends/aoti/slim/c10/core/ScalarType.h>
#include <executorch/backends/aoti/slim/c10/core/SizesAndStrides.h>
#include <executorch/backends/aoti/slim/core/Storage.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/SizeUtil.h>
#include <executorch/backends/aoti/slim/core/storage.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/backends/aoti/slim/util/size_util.h>
#include <executorch/runtime/platform/assert.h>

namespace executorch::backends::aoti::slim {
Expand Down Expand Up @@ -568,4 +568,4 @@ class SlimTensor {

// Include view operations implementations (must be after SlimTensor class
// definition)
#include <executorch/backends/aoti/slim/core/SlimTensorView-incl.h>
#include <executorch/backends/aoti/slim/core/slim_tensor_view_incl.h>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

#include <executorch/backends/aoti/slim/c10/core/WrapDimMinimal.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>

namespace executorch::backends::aoti::slim {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include <executorch/backends/aoti/slim/c10/core/Device.h>
#include <executorch/backends/aoti/slim/c10/core/ScalarType.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/SharedPtr.h>
#include <executorch/backends/aoti/slim/util/SizeUtil.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/backends/aoti/slim/util/shared_ptr.h>
#include <executorch/backends/aoti/slim/util/size_util.h>
#include <executorch/runtime/platform/assert.h>
#include <executorch/runtime/platform/log.h>

Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/core/targets.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def define_common_targets():
runtime.cxx_library(
name = "storage",
headers = [
"Storage.h",
"storage.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand All @@ -25,8 +25,8 @@ def define_common_targets():
runtime.cxx_library(
name = "slimtensor",
headers = [
"SlimTensor.h",
"SlimTensorView-incl.h",
"slim_tensor.h",
"slim_tensor_view_incl.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/core/test/test_as_strided.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/SlimTensorView-incl.h>
#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/core/slim_tensor_view_incl.h>
#include <executorch/backends/aoti/slim/factory/empty.h>

#ifdef CUDA_AVAILABLE
#include <cuda_runtime.h>
Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/core/test/test_permute_reshape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/SlimTensorView-incl.h>
#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/core/slim_tensor_view_incl.h>
#include <executorch/backends/aoti/slim/factory/empty.h>

#ifdef CUDA_AVAILABLE
#include <cuda_runtime.h>
Expand Down
4 changes: 2 additions & 2 deletions backends/aoti/slim/core/test/test_slimtensor_basic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/Storage.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/core/storage.h>

namespace executorch::backends::aoti::slim {

Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/core/test/test_slimtensor_copy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/Storage.h>
#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/core/storage.h>
#include <executorch/backends/aoti/slim/factory/empty.h>

namespace executorch::backends::aoti::slim {

Expand Down
2 changes: 1 addition & 1 deletion backends/aoti/slim/core/test/test_slimtensor_dtypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <cstring>
#include <type_traits>

#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/factory/empty.h>

namespace executorch::backends::aoti::slim {

Expand Down
2 changes: 1 addition & 1 deletion backends/aoti/slim/core/test/test_storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/Storage.h>
#include <executorch/backends/aoti/slim/core/storage.h>

#ifdef CUDA_AVAILABLE
#include <cuda_runtime.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#include <cstdint>

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/SizeUtil.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/backends/aoti/slim/util/size_util.h>

namespace executorch::backends::aoti::slim {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#pragma once

#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/SizeUtil.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/backends/aoti/slim/util/size_util.h>

namespace executorch::backends::aoti::slim {

Expand Down
4 changes: 2 additions & 2 deletions backends/aoti/slim/factory/targets.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def define_common_targets():
runtime.cxx_library(
name = "empty",
headers = [
"Empty.h",
"empty.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand All @@ -20,7 +20,7 @@ def define_common_targets():
runtime.cxx_library(
name = "from_blob",
headers = [
"FromBlob.h",
"from_blob.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand Down
2 changes: 1 addition & 1 deletion backends/aoti/slim/factory/test/test_empty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/factory/empty.h>

#ifdef CUDA_AVAILABLE
#include <cuda_runtime.h>
Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/factory/test/test_from_blob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/core/Storage.h>
#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/factory/FromBlob.h>
#include <executorch/backends/aoti/slim/core/storage.h>
#include <executorch/backends/aoti/slim/factory/empty.h>
#include <executorch/backends/aoti/slim/factory/from_blob.h>

#ifdef CUDA_AVAILABLE
#include <cuda_runtime.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <optional>
#include <vector>

#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/runtime/platform/assert.h>

namespace executorch::backends::aoti::slim {
Expand Down
6 changes: 3 additions & 3 deletions backends/aoti/slim/util/targets.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def define_common_targets():
runtime.cxx_library(
name = "shared_ptr",
headers = [
"SharedPtr.h",
"shared_ptr.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand All @@ -19,7 +19,7 @@ def define_common_targets():
runtime.cxx_library(
name = "array_ref_util",
headers = [
"ArrayRefUtil.h",
"array_ref_util.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand All @@ -31,7 +31,7 @@ def define_common_targets():
runtime.cxx_library(
name = "size_util",
headers = [
"SizeUtil.h",
"size_util.h",
],
visibility = ["@EXECUTORCH_CLIENTS"],
exported_deps = [
Expand Down
2 changes: 1 addition & 1 deletion backends/aoti/slim/util/test/test_size_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <gtest/gtest.h>

#include <executorch/backends/aoti/slim/util/SizeUtil.h>
#include <executorch/backends/aoti/slim/util/size_util.h>

namespace executorch::backends::aoti::slim {

Expand Down
2 changes: 1 addition & 1 deletion backends/aoti/tests/test_common_shims_slim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <executorch/backends/aoti/common_shims_slim.h>
#include <executorch/backends/aoti/slim/c10/core/Device.h>
#include <executorch/backends/aoti/slim/c10/core/ScalarType.h>
#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/factory/empty.h>
#include <executorch/runtime/core/error.h>
#include <executorch/runtime/platform/platform.h>

Expand Down
9 changes: 5 additions & 4 deletions backends/cuda/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ install(
DESTINATION lib
)

# CUDA-specific AOTI shim symbols (dynamically linked)
# CUDA-specific AOTI shim symbols (dynamically linked) Uses
# common_shims_slim.cpp for SlimTensor-based shim implementations
set(_aoti_cuda_shim_sources
runtime/shims/memory.cpp runtime/shims/tensor_attribute.cpp
runtime/guard.cpp runtime/shims/cuda_guard.cpp runtime/shims/int4mm.cu
${EXECUTORCH_ROOT}/backends/aoti/common_shims.cpp
runtime/shims/memory.cpp runtime/guard.cpp runtime/shims/cuda_guard.cpp
runtime/shims/int4mm.cu ${EXECUTORCH_ROOT}/backends/aoti/common_shims.cpp
${EXECUTORCH_ROOT}/backends/aoti/common_shims_slim.cpp
)

add_library(aoti_cuda_shims SHARED ${_aoti_cuda_shim_sources})
Expand Down
6 changes: 3 additions & 3 deletions backends/cuda/runtime/shims/memory_slim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include <executorch/backends/cuda/runtime/shims/memory_slim.h>

#include <executorch/backends/aoti/slim/factory/Empty.h>
#include <executorch/backends/aoti/slim/factory/FromBlob.h>
#include <executorch/backends/aoti/slim/util/ArrayRefUtil.h>
#include <executorch/backends/aoti/slim/factory/empty.h>
#include <executorch/backends/aoti/slim/factory/from_blob.h>
#include <executorch/backends/aoti/slim/util/array_ref_util.h>
#include <executorch/runtime/platform/assert.h>

namespace executorch::backends::cuda {
Expand Down
4 changes: 2 additions & 2 deletions backends/cuda/runtime/shims/memory_slim.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <cstdint>

#include <executorch/backends/aoti/export.h>
#include <executorch/backends/aoti/slim/core/SlimTensor.h>
#include <executorch/backends/aoti/slim/core/SlimTensorView-incl.h>
#include <executorch/backends/aoti/slim/core/slim_tensor.h>
#include <executorch/backends/aoti/slim/core/slim_tensor_view_incl.h>
#include <executorch/runtime/core/error.h>

namespace executorch::backends::cuda {
Expand Down
Loading