From 2c53b4a534a9b64466e435d384c91f0b684ea58a Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 8 Jul 2024 18:09:39 -0700 Subject: [PATCH] Remove core/common/gsl.h (#20894) ### Description It might be easier if we just directly include the original gsl headers. "core/common/gsl.h" is an indirection that doesn't provide extra help. --- include/onnxruntime/core/common/gsl.h | 6 ------ include/onnxruntime/core/common/logging/capture.h | 2 +- include/onnxruntime/core/common/span_utils.h | 2 +- include/onnxruntime/core/framework/data_types.h | 2 +- include/onnxruntime/core/framework/int4.h | 2 +- include/onnxruntime/core/framework/op_kernel.h | 2 +- include/onnxruntime/core/framework/op_kernel_info.h | 2 +- include/onnxruntime/core/framework/op_node_proto_helper.h | 2 +- include/onnxruntime/core/framework/tensor.h | 2 +- include/onnxruntime/core/framework/tensor_shape.h | 2 +- include/onnxruntime/core/graph/graph.h | 2 +- onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h | 2 +- onnxruntime/contrib_ops/cpu/attnlstm/uni_dir_attn_lstm.h | 2 +- onnxruntime/contrib_ops/cpu/crop.h | 2 +- onnxruntime/contrib_ops/cpu/quantization/qlinear_softmax.cc | 2 +- onnxruntime/contrib_ops/cpu/transformers/beam_search.cc | 2 +- .../cpu/transformers/generation_device_helper.cc | 2 +- .../contrib_ops/cpu/transformers/generation_device_helper.h | 2 +- .../contrib_ops/cpu/transformers/generation_shared.h | 2 +- onnxruntime/contrib_ops/cpu/transformers/greedy_search.cc | 2 +- onnxruntime/contrib_ops/cpu/transformers/sequences.h | 2 +- onnxruntime/contrib_ops/cpu/transformers/subgraph_base.cc | 2 +- onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h | 2 +- onnxruntime/contrib_ops/cpu/transformers/subgraph_gpt.cc | 2 +- .../contrib_ops/cpu/transformers/subgraph_t5_decoder.cc | 2 +- .../contrib_ops/cpu/transformers/subgraph_t5_encoder.cc | 2 +- .../cpu/transformers/subgraph_whisper_decoder.cc | 2 +- .../cpu/transformers/subgraph_whisper_encoder.cc | 2 +- onnxruntime/contrib_ops/cuda/bert/attention_impl.h | 2 +- onnxruntime/contrib_ops/cuda/collective/sharding_spec.cc | 2 +- .../cuda/transformers/generation_device_helper.h | 2 +- onnxruntime/core/codegen/mti/mti_tvm_utils.h | 2 +- onnxruntime/core/codegen/mti/tensor/concat_ops.cc | 2 +- onnxruntime/core/codegen/mti/tensor/gather.cc | 2 +- onnxruntime/core/codegen/mti/tensor/slice.cc | 2 +- onnxruntime/core/codegen/mti/tensor/split.cc | 2 +- onnxruntime/core/codegen/mti/tensor/tile.cc | 2 +- onnxruntime/core/codegen/passes/utils/ort_tvm_utils.cc | 2 +- onnxruntime/core/common/logging/capture.cc | 2 +- onnxruntime/core/flatbuffers/flatbuffers_utils.cc | 2 +- onnxruntime/core/framework/data_transfer_utils.h | 2 +- onnxruntime/core/framework/endian_utils.h | 2 +- onnxruntime/core/framework/fallback_cpu_capability.h | 2 +- onnxruntime/core/framework/kernel_lookup.h | 2 +- onnxruntime/core/framework/kernel_registry_manager.h | 2 +- onnxruntime/core/framework/kernel_type_str_resolver.h | 2 +- onnxruntime/core/framework/kernel_type_str_resolver_utils.h | 2 +- onnxruntime/core/framework/op_node_proto_helper.cc | 2 +- onnxruntime/core/framework/session_options.h | 2 +- onnxruntime/core/framework/session_state.h | 2 +- onnxruntime/core/framework/tensorprotoutils.cc | 2 +- onnxruntime/core/framework/transpose_helper.h | 2 +- onnxruntime/core/graph/graph.cc | 2 +- onnxruntime/core/graph/model.cc | 2 +- onnxruntime/core/graph/node_attr_utils.h | 2 +- .../core/graph/runtime_optimization_record_container.cc | 2 +- onnxruntime/core/optimizer/free_dim_override_transformer.h | 2 +- onnxruntime/core/optimizer/initializer.cc | 2 +- .../qdq_transformer/selectors_actions/shared/utils.h | 2 +- onnxruntime/core/optimizer/selectors_actions/actions.h | 2 +- onnxruntime/core/optimizer/selectors_actions/helpers.h | 2 +- .../transpose_optimization/onnx_transpose_optimization.cc | 2 +- onnxruntime/core/platform/env.h | 2 +- onnxruntime/core/platform/posix/env.cc | 2 +- onnxruntime/core/platform/windows/env.cc | 2 +- onnxruntime/core/platform/windows/stacktrace.cc | 2 +- .../core/providers/coreml/builders/impl/builder_utils.h | 2 +- onnxruntime/core/providers/coreml/model/model.h | 2 +- onnxruntime/core/providers/coreml/model/model.mm | 2 +- onnxruntime/core/providers/coreml/shape_utils.h | 2 +- onnxruntime/core/providers/cpu/controlflow/loop.cc | 2 +- onnxruntime/core/providers/cpu/controlflow/scan.h | 2 +- onnxruntime/core/providers/cpu/controlflow/scan_9.cc | 2 +- onnxruntime/core/providers/cpu/generator/random.h | 2 +- onnxruntime/core/providers/cpu/math/hardmax.h | 2 +- onnxruntime/core/providers/cpu/math/sign.cc | 2 +- onnxruntime/core/providers/cpu/math/softmax.h | 2 +- onnxruntime/core/providers/cpu/math/softmax_shared.cc | 2 +- onnxruntime/core/providers/cpu/ml/cast_map.cc | 2 +- onnxruntime/core/providers/cpu/ml/category_mapper.cc | 2 +- onnxruntime/core/providers/cpu/ml/feature_vectorizer.cc | 2 +- onnxruntime/core/providers/cpu/ml/label_encoder.cc | 2 +- onnxruntime/core/providers/cpu/nn/flatten.h | 2 +- onnxruntime/core/providers/cpu/nn/lrn.h | 2 +- onnxruntime/core/providers/cpu/rnn/rnn_helpers.h | 2 +- onnxruntime/core/providers/cpu/tensor/cast_op.cc | 2 +- .../providers/cpu/tensor/mean_variance_normalization.cc | 2 +- onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc | 2 +- onnxruntime/core/providers/cpu/tensor/shape_op.h | 2 +- .../core/providers/cpu/tensor/slice_compute_metadata.h | 2 +- onnxruntime/core/providers/cpu/tensor/split.cc | 2 +- onnxruntime/core/providers/cpu/tensor/transpose.h | 2 +- onnxruntime/core/providers/cpu/tensor/unique.cc | 2 +- onnxruntime/core/providers/cpu/tensor/utils.h | 2 +- onnxruntime/core/providers/cuda/cuda_common.h | 2 +- onnxruntime/core/providers/cuda/cuda_provider_factory.cc | 2 +- onnxruntime/core/providers/cuda/cudnn_common.cc | 2 +- onnxruntime/core/providers/cuda/math/softmax.h | 2 +- onnxruntime/core/providers/cuda/multi_tensor/common.cuh | 2 +- onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h | 2 +- onnxruntime/core/providers/cuda/rnn/gru.h | 2 +- onnxruntime/core/providers/cuda/shared_inc/cuda_utils.h | 2 +- onnxruntime/core/providers/cuda/tensor/transpose.h | 2 +- .../core/providers/dml/DmlExecutionProvider/src/precomp.h | 2 +- onnxruntime/core/providers/dml/GraphTransformers/precomp.h | 2 +- .../dml/OperatorAuthorHelper/MLOperatorAuthorHelper.h | 2 +- .../core/providers/dml/OperatorAuthorHelper/precomp.h | 2 +- onnxruntime/core/providers/js/operators/conv_transpose.h | 2 +- onnxruntime/core/providers/js/operators/transpose.h | 2 +- .../core/providers/nnapi/nnapi_builtin/builders/helper.h | 2 +- .../nnapi/nnapi_builtin/builders/op_builder_helpers.cc | 2 +- .../core/providers/qnn/builder/qnn_backend_manager.cc | 2 +- .../core/providers/qnn/builder/qnn_quant_params_wrapper.h | 2 +- onnxruntime/core/providers/rocm/math/softmax.h | 2 +- onnxruntime/core/providers/rocm/miopen_common.cc | 2 +- onnxruntime/core/providers/rocm/rocm_common.h | 2 +- onnxruntime/core/providers/rocm/rocm_provider_factory.cc | 2 +- onnxruntime/core/providers/shared_library/provider_api.h | 2 +- .../core/providers/tensorrt/tensorrt_execution_provider.cc | 2 +- onnxruntime/core/providers/tvm/tvm_api.cc | 2 +- onnxruntime/core/providers/vitisai/imp/attr_proto.h | 2 +- onnxruntime/core/providers/vitisai/include/vaip/vaip_gsl.h | 2 +- onnxruntime/core/providers/xnnpack/nn/conv.cc | 2 +- onnxruntime/core/session/custom_ops.cc | 2 +- onnxruntime/core/util/matrix_layout.h | 2 +- onnxruntime/test/common/random_generator.h | 2 +- onnxruntime/test/common/tensor_op_test_utils.h | 2 +- onnxruntime/test/contrib_ops/beam_search_test.cc | 2 +- onnxruntime/test/contrib_ops/greedy_search_test.cc | 2 +- onnxruntime/test/contrib_ops/sampling_test.cc | 2 +- onnxruntime/test/framework/test_utils.h | 2 +- onnxruntime/test/optimizer/initializer_test.cc | 2 +- onnxruntime/test/platform/file_io_test.cc | 2 +- .../test/providers/cpu/ml/array_feature_extractor_test.cc | 2 +- onnxruntime/test/providers/cpu/tensor/cast_op_test.cc | 2 +- onnxruntime/test/providers/cpu/tensor/where_op_test.cc | 2 +- .../test/providers/cuda/test_cases/cuda_test_provider.cc | 2 +- onnxruntime/test/shared_lib/test_inference.cc | 2 +- onnxruntime/test/shared_lib/test_nontensor_types.cc | 2 +- .../custom_execution_provider_library/my_ep_factory.cc | 2 +- onnxruntime/test/util/include/test_utils.h | 2 +- .../orttraining/core/optimizer/graph_transformer_utils.h | 2 +- .../test/training_api/common/synthetic_data_loader.h | 2 +- .../training_ops/cpu/activation/activations_grad.cc | 2 +- .../orttraining/training_ops/cpu/loss/cross_entropy.cc | 2 +- .../training_ops/cpu/loss/softmax_cross_entropy_loss.cc | 2 +- orttraining/orttraining/training_ops/cpu/op_gradients.cc | 2 +- orttraining/orttraining/training_ops/cpu/tensor/split.cc | 2 +- winml/lib/Api.Ort/OnnxruntimeEngine.h | 2 +- 149 files changed, 148 insertions(+), 154 deletions(-) delete mode 100644 include/onnxruntime/core/common/gsl.h diff --git a/include/onnxruntime/core/common/gsl.h b/include/onnxruntime/core/common/gsl.h deleted file mode 100644 index 371c5b7543b5..000000000000 --- a/include/onnxruntime/core/common/gsl.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -#include "gsl/gsl" diff --git a/include/onnxruntime/core/common/logging/capture.h b/include/onnxruntime/core/common/logging/capture.h index 2af050918706..13d3a3ad17af 100644 --- a/include/onnxruntime/core/common/logging/capture.h +++ b/include/onnxruntime/core/common/logging/capture.h @@ -4,7 +4,7 @@ #pragma once #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/code_location.h" #include "core/common/logging/severity.h" diff --git a/include/onnxruntime/core/common/span_utils.h b/include/onnxruntime/core/common/span_utils.h index b2d1aefee9c0..9f7454625fcd 100644 --- a/include/onnxruntime/core/common/span_utils.h +++ b/include/onnxruntime/core/common/span_utils.h @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include namespace onnxruntime { diff --git a/include/onnxruntime/core/framework/data_types.h b/include/onnxruntime/core/framework/data_types.h index b197d8809043..87feefa10ca4 100644 --- a/include/onnxruntime/core/framework/data_types.h +++ b/include/onnxruntime/core/framework/data_types.h @@ -9,7 +9,7 @@ #include #include #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/exceptions.h" #include "core/framework/endian.h" diff --git a/include/onnxruntime/core/framework/int4.h b/include/onnxruntime/core/framework/int4.h index aff365dc9738..0282b84bd0f8 100644 --- a/include/onnxruntime/core/framework/int4.h +++ b/include/onnxruntime/core/framework/int4.h @@ -6,7 +6,7 @@ #include #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { diff --git a/include/onnxruntime/core/framework/op_kernel.h b/include/onnxruntime/core/framework/op_kernel.h index 94c6d81ee932..ddaa1ebd088a 100644 --- a/include/onnxruntime/core/framework/op_kernel.h +++ b/include/onnxruntime/core/framework/op_kernel.h @@ -25,7 +25,7 @@ #include "core/graph/constants.h" #include "core/graph/graph_viewer.h" #include "core/graph/onnx_protobuf.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { class OpKernelContext; } diff --git a/include/onnxruntime/core/framework/op_kernel_info.h b/include/onnxruntime/core/framework/op_kernel_info.h index a0bbfe50a700..1510cdc9d145 100644 --- a/include/onnxruntime/core/framework/op_kernel_info.h +++ b/include/onnxruntime/core/framework/op_kernel_info.h @@ -8,7 +8,7 @@ #include "core/framework/ort_value.h" #include "core/framework/op_node_proto_helper.h" #include "core/graph/graph_viewer.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { diff --git a/include/onnxruntime/core/framework/op_node_proto_helper.h b/include/onnxruntime/core/framework/op_node_proto_helper.h index e7ac01947af4..5cbaaa0212c5 100644 --- a/include/onnxruntime/core/framework/op_node_proto_helper.h +++ b/include/onnxruntime/core/framework/op_node_proto_helper.h @@ -7,7 +7,7 @@ #include "core/common/status.h" #include "core/framework/tensor_shape.h" #include "core/graph/graph_viewer.h" -#include "core/common/gsl.h" +#include #endif class IMLOpKernel; diff --git a/include/onnxruntime/core/framework/tensor.h b/include/onnxruntime/core/framework/tensor.h index 96725aa10306..dd2603d214f6 100644 --- a/include/onnxruntime/core/framework/tensor.h +++ b/include/onnxruntime/core/framework/tensor.h @@ -9,7 +9,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/allocator.h" #include "core/framework/tensor_shape.h" diff --git a/include/onnxruntime/core/framework/tensor_shape.h b/include/onnxruntime/core/framework/tensor_shape.h index 82a1c1de8352..d4ee4a0e5e64 100644 --- a/include/onnxruntime/core/framework/tensor_shape.h +++ b/include/onnxruntime/core/framework/tensor_shape.h @@ -9,7 +9,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers_fwd.h" #include "core/common/span_utils.h" #include "onnxruntime_config.h" diff --git a/include/onnxruntime/core/graph/graph.h b/include/onnxruntime/core/graph/graph.h index 7dabe42ba0a2..9289e14c17dd 100644 --- a/include/onnxruntime/core/graph/graph.h +++ b/include/onnxruntime/core/graph/graph.h @@ -14,7 +14,7 @@ #include "core/common/flatbuffers.h" -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/path_string.h" diff --git a/onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h b/onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h index 37ef36ac911b..c0ae5f8ceba9 100644 --- a/onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h +++ b/onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/onnxruntime/contrib_ops/cpu/attnlstm/uni_dir_attn_lstm.h b/onnxruntime/contrib_ops/cpu/attnlstm/uni_dir_attn_lstm.h index aad077489186..ce91760516cb 100644 --- a/onnxruntime/contrib_ops/cpu/attnlstm/uni_dir_attn_lstm.h +++ b/onnxruntime/contrib_ops/cpu/attnlstm/uni_dir_attn_lstm.h @@ -11,7 +11,7 @@ #include "core/common/logging/logging.h" #include "core/framework/allocator.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/onnxruntime/contrib_ops/cpu/crop.h b/onnxruntime/contrib_ops/cpu/crop.h index 0fd0a5c49b3b..3b72ef429c1f 100644 --- a/onnxruntime/contrib_ops/cpu/crop.h +++ b/onnxruntime/contrib_ops/cpu/crop.h @@ -6,7 +6,7 @@ #include "core/common/common.h" #include "core/framework/op_kernel.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/onnxruntime/contrib_ops/cpu/quantization/qlinear_softmax.cc b/onnxruntime/contrib_ops/cpu/quantization/qlinear_softmax.cc index ed6071b40feb..de1798e54874 100644 --- a/onnxruntime/contrib_ops/cpu/quantization/qlinear_softmax.cc +++ b/onnxruntime/contrib_ops/cpu/quantization/qlinear_softmax.cc @@ -15,7 +15,7 @@ #include "core/mlas/inc/mlas.h" #include "core/platform/threadpool.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc b/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc index 688b7d6341ae..12fae5ccf098 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc @@ -26,7 +26,7 @@ #include "core/framework/TensorSeq.h" #include "core/framework/allocator.h" #include "core/framework/ort_value.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/beam_search.h" #include "contrib_ops/cpu/transformers/logits_processor.h" #include "contrib_ops/cpu/transformers/sequences.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.cc b/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.cc index 8c1ceec62fec..3bdb274d7d5a 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.cc @@ -8,7 +8,7 @@ #include "core/providers/cpu/math/softmax_shared.h" #include "core/providers/cpu/generator/random.h" #include "core/common/safeint.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/sequences.h" #include "contrib_ops/cpu/transformers/beam_search_scorer.h" #include "contrib_ops/cpu/transformers/generation_device_helper.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.h b/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.h index 8f778c57bb41..7f99a808f442 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.h +++ b/onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.h @@ -10,7 +10,7 @@ #endif #include -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/logits_processor.h" #include "contrib_ops/cpu/transformers/generation_shared.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/generation_shared.h b/onnxruntime/contrib_ops/cpu/transformers/generation_shared.h index 2b8b26f0a06f..30bf3aa0a121 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/generation_shared.h +++ b/onnxruntime/contrib_ops/cpu/transformers/generation_shared.h @@ -5,7 +5,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/allocator.h" #include "core/framework/ort_value.h" #include "contrib_ops/cpu/utils/debug_macros.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/greedy_search.cc b/onnxruntime/contrib_ops/cpu/transformers/greedy_search.cc index 788eab1b672d..a107889afd76 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/greedy_search.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/greedy_search.cc @@ -26,7 +26,7 @@ #include "core/framework/session_options.h" #include "core/framework/TensorSeq.h" #include "core/framework/ort_value.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/greedy_search.h" #include "contrib_ops/cpu/transformers/logits_processor.h" #include "contrib_ops/cpu/transformers/sequences.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/sequences.h b/onnxruntime/contrib_ops/cpu/transformers/sequences.h index 99c9474a2ca4..440a07e14a6c 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/sequences.h +++ b/onnxruntime/contrib_ops/cpu/transformers/sequences.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/generation_shared.h" namespace onnxruntime { diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.cc index 83aa99ff4d50..d675ba742e03 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.cc @@ -7,7 +7,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_base.h" #include "contrib_ops/cpu/utils/dump_tensor.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h b/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h index 487a35c55a85..bde591626bb8 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h @@ -5,7 +5,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/allocator.h" #include "core/framework/feeds_fetches_manager.h" #include "contrib_ops/cpu/transformers/generation_device_helper.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_gpt.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_gpt.cc index 443d69d49470..34a1da99316a 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_gpt.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_gpt.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_gpt.h" #include "contrib_ops/cpu/utils/dump_tensor.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_decoder.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_decoder.cc index 4264ceff042f..9037e58aaf31 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_decoder.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_decoder.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_t5_decoder.h" #include "contrib_ops/cpu/utils/dump_tensor.h" #include "contrib_ops/cpu/transformers/generation_device_helper.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_encoder.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_encoder.cc index 887a2b5cc519..51473c0c931b 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_encoder.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_t5_encoder.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_t5_encoder.h" namespace onnxruntime { diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_decoder.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_decoder.cc index f3da01c952f5..bf866d67ffc0 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_decoder.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_decoder.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_t5_decoder.h" #include "contrib_ops/cpu/transformers/subgraph_whisper_decoder.h" #include "contrib_ops/cpu/utils/dump_tensor.h" diff --git a/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_encoder.cc b/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_encoder.cc index 8480edc405e5..ff5f256e7bb7 100644 --- a/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_encoder.cc +++ b/onnxruntime/contrib_ops/cpu/transformers/subgraph_whisper_encoder.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "core/providers/cpu/tensor/utils.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/subgraph_t5_encoder.h" #include "contrib_ops/cpu/transformers/subgraph_whisper_encoder.h" diff --git a/onnxruntime/contrib_ops/cuda/bert/attention_impl.h b/onnxruntime/contrib_ops/cuda/bert/attention_impl.h index fda7ac278412..56836bdda197 100644 --- a/onnxruntime/contrib_ops/cuda/bert/attention_impl.h +++ b/onnxruntime/contrib_ops/cuda/bert/attention_impl.h @@ -5,7 +5,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/allocator.h" #include "contrib_ops/cpu/bert/attention_common.h" diff --git a/onnxruntime/contrib_ops/cuda/collective/sharding_spec.cc b/onnxruntime/contrib_ops/cuda/collective/sharding_spec.cc index 20c936e1b671..e1549ad29566 100644 --- a/onnxruntime/contrib_ops/cuda/collective/sharding_spec.cc +++ b/onnxruntime/contrib_ops/cuda/collective/sharding_spec.cc @@ -4,7 +4,7 @@ #include "sharding_spec.h" #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/framework/tensor_shape.h" #include diff --git a/onnxruntime/contrib_ops/cuda/transformers/generation_device_helper.h b/onnxruntime/contrib_ops/cuda/transformers/generation_device_helper.h index 6b712ccfbeb7..0fe2d7ccb1f7 100644 --- a/onnxruntime/contrib_ops/cuda/transformers/generation_device_helper.h +++ b/onnxruntime/contrib_ops/cuda/transformers/generation_device_helper.h @@ -7,7 +7,7 @@ #include "core/providers/cpu/tensor/utils.h" #include "core/providers/cuda/cuda_common.h" -#include "core/common/gsl.h" +#include #include "contrib_ops/cpu/transformers/sequences.h" #include "contrib_ops/cpu/transformers/generation_shared.h" diff --git a/onnxruntime/core/codegen/mti/mti_tvm_utils.h b/onnxruntime/core/codegen/mti/mti_tvm_utils.h index e85489dc1cac..c2a14106c168 100644 --- a/onnxruntime/core/codegen/mti/mti_tvm_utils.h +++ b/onnxruntime/core/codegen/mti/mti_tvm_utils.h @@ -5,7 +5,7 @@ #include #include -#include "core/common/gsl.h" +#include #include #include "core/codegen/mti/common.h" diff --git a/onnxruntime/core/codegen/mti/tensor/concat_ops.cc b/onnxruntime/core/codegen/mti/tensor/concat_ops.cc index 625a91bc6456..3394d5b7e00a 100644 --- a/onnxruntime/core/codegen/mti/tensor/concat_ops.cc +++ b/onnxruntime/core/codegen/mti/tensor/concat_ops.cc @@ -4,7 +4,7 @@ #include "core/codegen/mti/tensor/concat_ops.h" #include "core/codegen/mti/mti_tvm_utils.h" -#include "core/common/gsl.h" +#include #include namespace onnxruntime { diff --git a/onnxruntime/core/codegen/mti/tensor/gather.cc b/onnxruntime/core/codegen/mti/tensor/gather.cc index 3ea6ebf46620..152b3981f162 100644 --- a/onnxruntime/core/codegen/mti/tensor/gather.cc +++ b/onnxruntime/core/codegen/mti/tensor/gather.cc @@ -4,7 +4,7 @@ #include "core/codegen/mti/tensor/gather.h" #include "core/codegen/mti/mti_tvm_utils.h" -#include "core/common/gsl.h" +#include #include namespace onnxruntime { diff --git a/onnxruntime/core/codegen/mti/tensor/slice.cc b/onnxruntime/core/codegen/mti/tensor/slice.cc index 7c73be2b5234..6cbab43584d4 100644 --- a/onnxruntime/core/codegen/mti/tensor/slice.cc +++ b/onnxruntime/core/codegen/mti/tensor/slice.cc @@ -5,7 +5,7 @@ #include "core/codegen/mti/mti_tvm_utils.h" #include -#include "core/common/gsl.h" +#include #include #include diff --git a/onnxruntime/core/codegen/mti/tensor/split.cc b/onnxruntime/core/codegen/mti/tensor/split.cc index 8dbbd8fdcc28..6ee366314858 100644 --- a/onnxruntime/core/codegen/mti/tensor/split.cc +++ b/onnxruntime/core/codegen/mti/tensor/split.cc @@ -4,7 +4,7 @@ #include "core/codegen/mti/tensor/split.h" #include "core/codegen/mti/mti_tvm_utils.h" -#include "core/common/gsl.h" +#include #include namespace onnxruntime { diff --git a/onnxruntime/core/codegen/mti/tensor/tile.cc b/onnxruntime/core/codegen/mti/tensor/tile.cc index 60ef29f7ce70..2fef86adcbae 100644 --- a/onnxruntime/core/codegen/mti/tensor/tile.cc +++ b/onnxruntime/core/codegen/mti/tensor/tile.cc @@ -3,7 +3,7 @@ #include "core/codegen/mti/tensor/tile.h" #include "core/codegen/mti/mti_tvm_utils.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace tvm_codegen { diff --git a/onnxruntime/core/codegen/passes/utils/ort_tvm_utils.cc b/onnxruntime/core/codegen/passes/utils/ort_tvm_utils.cc index 888dddfd3dbd..55892974aa33 100644 --- a/onnxruntime/core/codegen/passes/utils/ort_tvm_utils.cc +++ b/onnxruntime/core/codegen/passes/utils/ort_tvm_utils.cc @@ -7,7 +7,7 @@ #include "core/codegen/passes/utils/codegen_context.h" #include "core/framework/tensorprotoutils.h" #include "core/providers/common.h" -#include "core/common/gsl.h" +#include #include diff --git a/onnxruntime/core/common/logging/capture.cc b/onnxruntime/core/common/logging/capture.cc index 3c23e15e5cc0..ac0d4d5fc707 100644 --- a/onnxruntime/core/common/logging/capture.cc +++ b/onnxruntime/core/common/logging/capture.cc @@ -3,7 +3,7 @@ #include "core/common/logging/capture.h" #include "core/common/logging/logging.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace logging { diff --git a/onnxruntime/core/flatbuffers/flatbuffers_utils.cc b/onnxruntime/core/flatbuffers/flatbuffers_utils.cc index 1eb3bbdb1237..42dff12eaa2d 100644 --- a/onnxruntime/core/flatbuffers/flatbuffers_utils.cc +++ b/onnxruntime/core/flatbuffers/flatbuffers_utils.cc @@ -4,7 +4,7 @@ #include "core/flatbuffers/flatbuffers_utils.h" #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/flatbuffers/schema/ort.fbs.h" #include "core/graph/constants.h" #include "core/graph/onnx_protobuf.h" diff --git a/onnxruntime/core/framework/data_transfer_utils.h b/onnxruntime/core/framework/data_transfer_utils.h index d54df49eeb9d..eeec329544bc 100644 --- a/onnxruntime/core/framework/data_transfer_utils.h +++ b/onnxruntime/core/framework/data_transfer_utils.h @@ -5,7 +5,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/tensor.h" diff --git a/onnxruntime/core/framework/endian_utils.h b/onnxruntime/core/framework/endian_utils.h index b83977c1ac67..6f084d058d00 100644 --- a/onnxruntime/core/framework/endian_utils.h +++ b/onnxruntime/core/framework/endian_utils.h @@ -5,7 +5,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/common/status.h" #include "core/common/common.h" diff --git a/onnxruntime/core/framework/fallback_cpu_capability.h b/onnxruntime/core/framework/fallback_cpu_capability.h index 7c8f91c7dad3..c5bcd22888b7 100644 --- a/onnxruntime/core/framework/fallback_cpu_capability.h +++ b/onnxruntime/core/framework/fallback_cpu_capability.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers_fwd.h" #include "core/framework/execution_provider.h" // for IExecutionProvider::IKernelLookup #include "core/graph/graph_viewer.h" diff --git a/onnxruntime/core/framework/kernel_lookup.h b/onnxruntime/core/framework/kernel_lookup.h index 2b4d3ce81623..0dd17d2f4a62 100644 --- a/onnxruntime/core/framework/kernel_lookup.h +++ b/onnxruntime/core/framework/kernel_lookup.h @@ -4,7 +4,7 @@ #pragma once #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/framework/execution_provider.h" // for IExecutionProvider::IKernelLookup #include "core/framework/kernel_registry.h" #include "core/framework/kernel_type_str_resolver.h" diff --git a/onnxruntime/core/framework/kernel_registry_manager.h b/onnxruntime/core/framework/kernel_registry_manager.h index 1868583f41ba..201fda6d978b 100644 --- a/onnxruntime/core/framework/kernel_registry_manager.h +++ b/onnxruntime/core/framework/kernel_registry_manager.h @@ -7,7 +7,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/common/status.h" #include "core/framework/kernel_type_str_resolver.h" diff --git a/onnxruntime/core/framework/kernel_type_str_resolver.h b/onnxruntime/core/framework/kernel_type_str_resolver.h index fea2a6ef3a43..587be491b360 100644 --- a/onnxruntime/core/framework/kernel_type_str_resolver.h +++ b/onnxruntime/core/framework/kernel_type_str_resolver.h @@ -13,7 +13,7 @@ #include "core/graph/onnx_protobuf.h" #endif // !defined(ORT_MINIMAL_BUILD) -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/common/status.h" #include "core/graph/op_identifier.h" diff --git a/onnxruntime/core/framework/kernel_type_str_resolver_utils.h b/onnxruntime/core/framework/kernel_type_str_resolver_utils.h index 3d06013e4fe7..5daab7c1159b 100644 --- a/onnxruntime/core/framework/kernel_type_str_resolver_utils.h +++ b/onnxruntime/core/framework/kernel_type_str_resolver_utils.h @@ -5,7 +5,7 @@ #if !defined(ORT_MINIMAL_BUILD) || defined(ORT_EXTENDED_MINIMAL_BUILD) -#include "core/common/gsl.h" +#include #include "core/common/status.h" #include "core/framework/kernel_type_str_resolver.h" #include "core/graph/op_identifier.h" diff --git a/onnxruntime/core/framework/op_node_proto_helper.cc b/onnxruntime/core/framework/op_node_proto_helper.cc index c3deb94300e7..ca9b74eafe4d 100644 --- a/onnxruntime/core/framework/op_node_proto_helper.cc +++ b/onnxruntime/core/framework/op_node_proto_helper.cc @@ -6,7 +6,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/graph/onnx_protobuf.h" #include "core/graph/op.h" -#include "core/common/gsl.h" +#include using namespace ONNX_NAMESPACE; using namespace ::onnxruntime::common; diff --git a/onnxruntime/core/framework/session_options.h b/onnxruntime/core/framework/session_options.h index 13da26d5e605..46bfc3630303 100644 --- a/onnxruntime/core/framework/session_options.h +++ b/onnxruntime/core/framework/session_options.h @@ -8,7 +8,7 @@ #include #include #include -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/framework/config_options.h" #include "core/framework/ort_value.h" diff --git a/onnxruntime/core/framework/session_state.h b/onnxruntime/core/framework/session_state.h index e318c9a8238c..b1a7504b283c 100644 --- a/onnxruntime/core/framework/session_state.h +++ b/onnxruntime/core/framework/session_state.h @@ -10,7 +10,7 @@ #include "core/common/flatbuffers.h" -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/inlined_containers.h" diff --git a/onnxruntime/core/framework/tensorprotoutils.cc b/onnxruntime/core/framework/tensorprotoutils.cc index 77323f268a27..e8086877a915 100644 --- a/onnxruntime/core/framework/tensorprotoutils.cc +++ b/onnxruntime/core/framework/tensorprotoutils.cc @@ -11,7 +11,7 @@ #include #endif -#include "core/common/gsl.h" +#include #include "core/common/logging/logging.h" #include "core/common/narrow.h" #include "core/common/span_utils.h" diff --git a/onnxruntime/core/framework/transpose_helper.h b/onnxruntime/core/framework/transpose_helper.h index c34d5ef3f27f..e33044117f89 100644 --- a/onnxruntime/core/framework/transpose_helper.h +++ b/onnxruntime/core/framework/transpose_helper.h @@ -37,7 +37,7 @@ We fall back to the default implementation in all other cases, and if the input #include "core/framework/tensor.h" #include "core/platform/threadpool.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { bool IsTransposeMovingSingleAxis(gsl::span permutations, size_t& from, size_t& to); diff --git a/onnxruntime/core/graph/graph.cc b/onnxruntime/core/graph/graph.cc index 67451301023e..7759976e1ecf 100644 --- a/onnxruntime/core/graph/graph.cc +++ b/onnxruntime/core/graph/graph.cc @@ -11,7 +11,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/common/logging/logging.h" #include "core/common/narrow.h" diff --git a/onnxruntime/core/graph/model.cc b/onnxruntime/core/graph/model.cc index e9d1b4e944ed..9bf3f1488b0e 100644 --- a/onnxruntime/core/graph/model.cc +++ b/onnxruntime/core/graph/model.cc @@ -20,7 +20,7 @@ #endif #include "core/util/protobuf_parsing_utils.h" -#include "core/common/gsl.h" +#include #include "core/platform/env.h" diff --git a/onnxruntime/core/graph/node_attr_utils.h b/onnxruntime/core/graph/node_attr_utils.h index 9433cfabc974..638cebe6a320 100644 --- a/onnxruntime/core/graph/node_attr_utils.h +++ b/onnxruntime/core/graph/node_attr_utils.h @@ -5,7 +5,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/graph/onnx_protobuf.h" #include "core/graph/basic_types.h" diff --git a/onnxruntime/core/graph/runtime_optimization_record_container.cc b/onnxruntime/core/graph/runtime_optimization_record_container.cc index acd85b909e5b..38c308d639d6 100644 --- a/onnxruntime/core/graph/runtime_optimization_record_container.cc +++ b/onnxruntime/core/graph/runtime_optimization_record_container.cc @@ -7,7 +7,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/flatbuffers/flatbuffers_utils.h" #include "core/flatbuffers/schema/ort.fbs.h" diff --git a/onnxruntime/core/optimizer/free_dim_override_transformer.h b/onnxruntime/core/optimizer/free_dim_override_transformer.h index f9553339a7ce..18e0b128b864 100644 --- a/onnxruntime/core/optimizer/free_dim_override_transformer.h +++ b/onnxruntime/core/optimizer/free_dim_override_transformer.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/optimizer/graph_transformer.h" diff --git a/onnxruntime/core/optimizer/initializer.cc b/onnxruntime/core/optimizer/initializer.cc index 5953935203b8..33fd613bb1a5 100644 --- a/onnxruntime/core/optimizer/initializer.cc +++ b/onnxruntime/core/optimizer/initializer.cc @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/tensorprotoutils.h" #include "core/framework/tensor_external_data_info.h" #include "core/platform/env.h" diff --git a/onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h b/onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h index de36202afff2..f38820655117 100644 --- a/onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h +++ b/onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h @@ -5,7 +5,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/framework/node_unit.h" #include "core/graph/basic_types.h" diff --git a/onnxruntime/core/optimizer/selectors_actions/actions.h b/onnxruntime/core/optimizer/selectors_actions/actions.h index e52ab16efe95..9384bfa7027c 100644 --- a/onnxruntime/core/optimizer/selectors_actions/actions.h +++ b/onnxruntime/core/optimizer/selectors_actions/actions.h @@ -6,7 +6,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/graph/graph_utils.h" // TODO: Minimize usage of this given we want to use Actions in a minimal build #include "core/graph/runtime_optimization_record.h" #include "core/optimizer/selectors_actions/helpers.h" diff --git a/onnxruntime/core/optimizer/selectors_actions/helpers.h b/onnxruntime/core/optimizer/selectors_actions/helpers.h index cf5489dc1960..c3d50d6de05a 100644 --- a/onnxruntime/core/optimizer/selectors_actions/helpers.h +++ b/onnxruntime/core/optimizer/selectors_actions/helpers.h @@ -4,7 +4,7 @@ #pragma once #include "core/common/basic_types.h" -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/graph/graph.h" #include "core/graph/runtime_optimization_record.h" diff --git a/onnxruntime/core/optimizer/transpose_optimization/onnx_transpose_optimization.cc b/onnxruntime/core/optimizer/transpose_optimization/onnx_transpose_optimization.cc index e6ffd0d91372..d4ed9c4e26cc 100644 --- a/onnxruntime/core/optimizer/transpose_optimization/onnx_transpose_optimization.cc +++ b/onnxruntime/core/optimizer/transpose_optimization/onnx_transpose_optimization.cc @@ -12,7 +12,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/make_string.h" #include "core/graph/constants.h" diff --git a/onnxruntime/core/platform/env.h b/onnxruntime/core/platform/env.h index 6917f42091bf..f4dff2c49113 100644 --- a/onnxruntime/core/platform/env.h +++ b/onnxruntime/core/platform/env.h @@ -22,7 +22,7 @@ limitations under the License. #include #include #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/path_string.h" diff --git a/onnxruntime/core/platform/posix/env.cc b/onnxruntime/core/platform/posix/env.cc index 9999550c241c..16d135c3acb2 100644 --- a/onnxruntime/core/platform/posix/env.cc +++ b/onnxruntime/core/platform/posix/env.cc @@ -44,7 +44,7 @@ limitations under the License. #endif #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/common/logging/logging.h" #include "core/common/narrow.h" #include "core/platform/scoped_resource.h" diff --git a/onnxruntime/core/platform/windows/env.cc b/onnxruntime/core/platform/windows/env.cc index dc090e446e60..712b69593a68 100644 --- a/onnxruntime/core/platform/windows/env.cc +++ b/onnxruntime/core/platform/windows/env.cc @@ -26,7 +26,7 @@ limitations under the License. #include #include -#include "core/common/gsl.h" +#include #include "core/common/logging/logging.h" #include "core/common/narrow.h" #include "core/common/span_utils.h" diff --git a/onnxruntime/core/platform/windows/stacktrace.cc b/onnxruntime/core/platform/windows/stacktrace.cc index d7d423e4a483..3401507ae911 100644 --- a/onnxruntime/core/platform/windows/stacktrace.cc +++ b/onnxruntime/core/platform/windows/stacktrace.cc @@ -12,7 +12,7 @@ #endif #include "core/common/logging/logging.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { diff --git a/onnxruntime/core/providers/coreml/builders/impl/builder_utils.h b/onnxruntime/core/providers/coreml/builders/impl/builder_utils.h index 3e6c43ab0786..97fb83b6dc48 100644 --- a/onnxruntime/core/providers/coreml/builders/impl/builder_utils.h +++ b/onnxruntime/core/providers/coreml/builders/impl/builder_utils.h @@ -7,7 +7,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/common/status.h" #include "core/graph/basic_types.h" #include "core/providers/common.h" diff --git a/onnxruntime/core/providers/coreml/model/model.h b/onnxruntime/core/providers/coreml/model/model.h index e3cd43d786fc..c4c3b38bba51 100644 --- a/onnxruntime/core/providers/coreml/model/model.h +++ b/onnxruntime/core/providers/coreml/model/model.h @@ -8,7 +8,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/common/logging/logging.h" #include "core/common/status.h" #include "core/platform/ort_mutex.h" diff --git a/onnxruntime/core/providers/coreml/model/model.mm b/onnxruntime/core/providers/coreml/model/model.mm index 3edcdb3f95e4..1d506099b436 100644 --- a/onnxruntime/core/providers/coreml/model/model.mm +++ b/onnxruntime/core/providers/coreml/model/model.mm @@ -13,7 +13,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers.h" #include "core/common/logging/logging.h" #include "core/common/narrow.h" diff --git a/onnxruntime/core/providers/coreml/shape_utils.h b/onnxruntime/core/providers/coreml/shape_utils.h index 0a1fd47cfdfe..23ee51af63d4 100644 --- a/onnxruntime/core/providers/coreml/shape_utils.h +++ b/onnxruntime/core/providers/coreml/shape_utils.h @@ -7,7 +7,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/logging/logging.h" #include "core/graph/node_arg.h" diff --git a/onnxruntime/core/providers/cpu/controlflow/loop.cc b/onnxruntime/core/providers/cpu/controlflow/loop.cc index 9837aabe786c..c65dd2a04bf5 100644 --- a/onnxruntime/core/providers/cpu/controlflow/loop.cc +++ b/onnxruntime/core/providers/cpu/controlflow/loop.cc @@ -23,7 +23,7 @@ #include "core/framework/TensorSeq.h" #include "core/providers/utils.h" -#include "core/common/gsl.h" +#include #ifdef _MSC_VER #pragma warning(pop) diff --git a/onnxruntime/core/providers/cpu/controlflow/scan.h b/onnxruntime/core/providers/cpu/controlflow/scan.h index 76c27827b99a..8516fa786da3 100644 --- a/onnxruntime/core/providers/cpu/controlflow/scan.h +++ b/onnxruntime/core/providers/cpu/controlflow/scan.h @@ -3,7 +3,7 @@ #pragma once #include -#include "core/common/gsl.h" +#include #ifndef SHARED_PROVIDER #include "core/common/common.h" diff --git a/onnxruntime/core/providers/cpu/controlflow/scan_9.cc b/onnxruntime/core/providers/cpu/controlflow/scan_9.cc index f7548fbf6050..24d233c0594f 100644 --- a/onnxruntime/core/providers/cpu/controlflow/scan_9.cc +++ b/onnxruntime/core/providers/cpu/controlflow/scan_9.cc @@ -21,7 +21,7 @@ #include "core/providers/cpu/tensor/utils.h" #include "core/providers/cpu/tensor/transpose.h" -#include "core/common/gsl.h" +#include #ifdef _MSC_VER #pragma warning(pop) diff --git a/onnxruntime/core/providers/cpu/generator/random.h b/onnxruntime/core/providers/cpu/generator/random.h index 2ff6549794ff..8a0390fe7af8 100644 --- a/onnxruntime/core/providers/cpu/generator/random.h +++ b/onnxruntime/core/providers/cpu/generator/random.h @@ -4,7 +4,7 @@ #pragma once #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/op_kernel.h" diff --git a/onnxruntime/core/providers/cpu/math/hardmax.h b/onnxruntime/core/providers/cpu/math/hardmax.h index 02b9b96fd3bf..1b77a30a164e 100644 --- a/onnxruntime/core/providers/cpu/math/hardmax.h +++ b/onnxruntime/core/providers/cpu/math/hardmax.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/op_kernel.h" diff --git a/onnxruntime/core/providers/cpu/math/sign.cc b/onnxruntime/core/providers/cpu/math/sign.cc index 60080135bbd2..1d3b444c83b6 100644 --- a/onnxruntime/core/providers/cpu/math/sign.cc +++ b/onnxruntime/core/providers/cpu/math/sign.cc @@ -3,7 +3,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/data_types.h" diff --git a/onnxruntime/core/providers/cpu/math/softmax.h b/onnxruntime/core/providers/cpu/math/softmax.h index 448a97bfbe0a..cac674b42945 100644 --- a/onnxruntime/core/providers/cpu/math/softmax.h +++ b/onnxruntime/core/providers/cpu/math/softmax.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/framework/op_kernel.h" diff --git a/onnxruntime/core/providers/cpu/math/softmax_shared.cc b/onnxruntime/core/providers/cpu/math/softmax_shared.cc index 0b6c35ffabb1..cae20b42725b 100644 --- a/onnxruntime/core/providers/cpu/math/softmax_shared.cc +++ b/onnxruntime/core/providers/cpu/math/softmax_shared.cc @@ -22,7 +22,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/util/math.h" #include "core/util/math_cpuonly.h" diff --git a/onnxruntime/core/providers/cpu/ml/cast_map.cc b/onnxruntime/core/providers/cpu/ml/cast_map.cc index 8dcc3393f581..f21eb99dd64e 100644 --- a/onnxruntime/core/providers/cpu/ml/cast_map.cc +++ b/onnxruntime/core/providers/cpu/ml/cast_map.cc @@ -3,7 +3,7 @@ #include "core/providers/cpu/ml/cast_map.h" #include -#include "core/common/gsl.h" +#include using namespace ::onnxruntime::common; namespace { diff --git a/onnxruntime/core/providers/cpu/ml/category_mapper.cc b/onnxruntime/core/providers/cpu/ml/category_mapper.cc index f56e98a286cf..88d83b2a2d33 100644 --- a/onnxruntime/core/providers/cpu/ml/category_mapper.cc +++ b/onnxruntime/core/providers/cpu/ml/category_mapper.cc @@ -3,7 +3,7 @@ #include "core/providers/cpu/ml/category_mapper.h" #include -#include "core/common/gsl.h" +#include using namespace ::onnxruntime::common; namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/ml/feature_vectorizer.cc b/onnxruntime/core/providers/cpu/ml/feature_vectorizer.cc index 24fbfac59473..6e46b2279f7d 100644 --- a/onnxruntime/core/providers/cpu/ml/feature_vectorizer.cc +++ b/onnxruntime/core/providers/cpu/ml/feature_vectorizer.cc @@ -3,7 +3,7 @@ #include "core/providers/cpu/ml/feature_vectorizer.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace ml { diff --git a/onnxruntime/core/providers/cpu/ml/label_encoder.cc b/onnxruntime/core/providers/cpu/ml/label_encoder.cc index 65102b62a963..67f38638d8da 100644 --- a/onnxruntime/core/providers/cpu/ml/label_encoder.cc +++ b/onnxruntime/core/providers/cpu/ml/label_encoder.cc @@ -3,7 +3,7 @@ #include "core/providers/cpu/ml/label_encoder.h" #include -#include "core/common/gsl.h" +#include using namespace ::onnxruntime::common; namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/nn/flatten.h b/onnxruntime/core/providers/cpu/nn/flatten.h index 45fb644d2a0e..b776d5e28d57 100644 --- a/onnxruntime/core/providers/cpu/nn/flatten.h +++ b/onnxruntime/core/providers/cpu/nn/flatten.h @@ -5,7 +5,7 @@ #include "core/common/common.h" #include "core/framework/op_kernel.h" -#include "core/common/gsl.h" +#include #include "core/providers/cpu/tensor/utils.h" #include "core/providers/common.h" diff --git a/onnxruntime/core/providers/cpu/nn/lrn.h b/onnxruntime/core/providers/cpu/nn/lrn.h index e797ffda87f7..dc27672aa056 100644 --- a/onnxruntime/core/providers/cpu/nn/lrn.h +++ b/onnxruntime/core/providers/cpu/nn/lrn.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/exceptions.h" diff --git a/onnxruntime/core/providers/cpu/rnn/rnn_helpers.h b/onnxruntime/core/providers/cpu/rnn/rnn_helpers.h index dfc7a2b68699..6d54c24b3808 100644 --- a/onnxruntime/core/providers/cpu/rnn/rnn_helpers.h +++ b/onnxruntime/core/providers/cpu/rnn/rnn_helpers.h @@ -18,7 +18,7 @@ #include "core/common/safeint.h" #include "core/platform/threadpool.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace rnn { diff --git a/onnxruntime/core/providers/cpu/tensor/cast_op.cc b/onnxruntime/core/providers/cpu/tensor/cast_op.cc index cbc4d8360d4b..6742bab4fa4a 100644 --- a/onnxruntime/core/providers/cpu/tensor/cast_op.cc +++ b/onnxruntime/core/providers/cpu/tensor/cast_op.cc @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/narrow.h" diff --git a/onnxruntime/core/providers/cpu/tensor/mean_variance_normalization.cc b/onnxruntime/core/providers/cpu/tensor/mean_variance_normalization.cc index 62c3dbfc87a7..6eef6b35a8fd 100644 --- a/onnxruntime/core/providers/cpu/tensor/mean_variance_normalization.cc +++ b/onnxruntime/core/providers/cpu/tensor/mean_variance_normalization.cc @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/providers/common.h" #include "core/providers/cpu/tensor/transpose.h" #include "core/util/math_cpuonly.h" diff --git a/onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc b/onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc index a03d1143d058..31ce89b3ed55 100644 --- a/onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc +++ b/onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc @@ -11,7 +11,7 @@ #pragma warning(disable : 4996) #endif -#include "core/common/gsl.h" +#include #ifdef _MSC_VER #pragma warning(pop) diff --git a/onnxruntime/core/providers/cpu/tensor/shape_op.h b/onnxruntime/core/providers/cpu/tensor/shape_op.h index b9e938995019..05d22595dd83 100644 --- a/onnxruntime/core/providers/cpu/tensor/shape_op.h +++ b/onnxruntime/core/providers/cpu/tensor/shape_op.h @@ -9,7 +9,7 @@ #include "core/framework/op_kernel.h" #endif -#include "core/common/gsl.h" +#include #include namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/tensor/slice_compute_metadata.h b/onnxruntime/core/providers/cpu/tensor/slice_compute_metadata.h index 05f1479315fe..c21cc13ad316 100644 --- a/onnxruntime/core/providers/cpu/tensor/slice_compute_metadata.h +++ b/onnxruntime/core/providers/cpu/tensor/slice_compute_metadata.h @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/tensor_shape.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/tensor/split.cc b/onnxruntime/core/providers/cpu/tensor/split.cc index 724814e2f1d5..4e43085fe288 100644 --- a/onnxruntime/core/providers/cpu/tensor/split.cc +++ b/onnxruntime/core/providers/cpu/tensor/split.cc @@ -4,7 +4,7 @@ #include "core/providers/cpu/tensor/split.h" #include "core/common/narrow.h" -#include "core/common/gsl.h" +#include #include "core/common/safeint.h" #include "core/framework/copy.h" #include "core/framework/element_type_lists.h" diff --git a/onnxruntime/core/providers/cpu/tensor/transpose.h b/onnxruntime/core/providers/cpu/tensor/transpose.h index fda41c28a256..54d3584ba0da 100644 --- a/onnxruntime/core/providers/cpu/tensor/transpose.h +++ b/onnxruntime/core/providers/cpu/tensor/transpose.h @@ -10,7 +10,7 @@ #include "core/framework/op_kernel.h" #endif -#include "core/common/gsl.h" +#include #include namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/tensor/unique.cc b/onnxruntime/core/providers/cpu/tensor/unique.cc index 135bef0860ca..ab99d87da83f 100644 --- a/onnxruntime/core/providers/cpu/tensor/unique.cc +++ b/onnxruntime/core/providers/cpu/tensor/unique.cc @@ -4,7 +4,7 @@ #include "core/providers/cpu/tensor/unique.h" #include #include -#include "core/common/gsl.h" +#include #include "core/framework/op_kernel_type_control_utils.h" #include "core/providers/common.h" #include "core/providers/op_kernel_type_control.h" diff --git a/onnxruntime/core/providers/cpu/tensor/utils.h b/onnxruntime/core/providers/cpu/tensor/utils.h index 17eac5417f0a..6adcfec85269 100644 --- a/onnxruntime/core/providers/cpu/tensor/utils.h +++ b/onnxruntime/core/providers/cpu/tensor/utils.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include "core/common/gsl.h" +#include #include "core/common/narrow.h" #ifndef SHARED_PROVIDER diff --git a/onnxruntime/core/providers/cuda/cuda_common.h b/onnxruntime/core/providers/cuda/cuda_common.h index 61da125b4095..0b56cac1038e 100644 --- a/onnxruntime/core/providers/cuda/cuda_common.h +++ b/onnxruntime/core/providers/cuda/cuda_common.h @@ -16,7 +16,7 @@ #include "core/providers/cuda/cuda_pch.h" #include "core/providers/cuda/shared_inc/cuda_call.h" #include "core/providers/cuda/shared_inc/fast_divmod.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace cuda { diff --git a/onnxruntime/core/providers/cuda/cuda_provider_factory.cc b/onnxruntime/core/providers/cuda/cuda_provider_factory.cc index 103c79c93b2c..7851da7fa91a 100644 --- a/onnxruntime/core/providers/cuda/cuda_provider_factory.cc +++ b/onnxruntime/core/providers/cuda/cuda_provider_factory.cc @@ -10,7 +10,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_execution_provider.h" #include "core/providers/cuda/cuda_execution_provider_info.h" diff --git a/onnxruntime/core/providers/cuda/cudnn_common.cc b/onnxruntime/core/providers/cuda/cudnn_common.cc index 914dc02a9eda..31fc63a86d64 100644 --- a/onnxruntime/core/providers/cuda/cudnn_common.cc +++ b/onnxruntime/core/providers/cuda/cudnn_common.cc @@ -6,7 +6,7 @@ #include "core/providers/cuda/cudnn_common.h" #include "core/common/inlined_containers.h" -#include "core/common/gsl.h" +#include #include "shared_inc/cuda_call.h" #include "core/providers/cpu/tensor/utils.h" #ifndef USE_CUDA_MINIMAL diff --git a/onnxruntime/core/providers/cuda/math/softmax.h b/onnxruntime/core/providers/cuda/math/softmax.h index bbe63e66e67d..6f4016b655c9 100644 --- a/onnxruntime/core/providers/cuda/math/softmax.h +++ b/onnxruntime/core/providers/cuda/math/softmax.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_kernel.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/cuda/multi_tensor/common.cuh b/onnxruntime/core/providers/cuda/multi_tensor/common.cuh index 2d7928776bb8..49a0a9c51472 100644 --- a/onnxruntime/core/providers/cuda/multi_tensor/common.cuh +++ b/onnxruntime/core/providers/cuda/multi_tensor/common.cuh @@ -10,7 +10,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace cuda { diff --git a/onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h b/onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h index 2bc937526f94..7b827f8d0459 100644 --- a/onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h +++ b/onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_kernel.h" #include "core/providers/cuda/cudnn_common.h" diff --git a/onnxruntime/core/providers/cuda/rnn/gru.h b/onnxruntime/core/providers/cuda/rnn/gru.h index 6f5c5ab6e956..e5ea1ed3e670 100644 --- a/onnxruntime/core/providers/cuda/rnn/gru.h +++ b/onnxruntime/core/providers/cuda/rnn/gru.h @@ -4,7 +4,7 @@ #pragma once #include "cudnn_rnn_base.h" -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_common.h" #include diff --git a/onnxruntime/core/providers/cuda/shared_inc/cuda_utils.h b/onnxruntime/core/providers/cuda/shared_inc/cuda_utils.h index 2df0a38d22f5..1f7df9b6fc2e 100644 --- a/onnxruntime/core/providers/cuda/shared_inc/cuda_utils.h +++ b/onnxruntime/core/providers/cuda/shared_inc/cuda_utils.h @@ -11,7 +11,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/float16.h" #include "core/providers/cuda/shared_inc/fast_divmod.h" diff --git a/onnxruntime/core/providers/cuda/tensor/transpose.h b/onnxruntime/core/providers/cuda/tensor/transpose.h index da73d1308dbf..31bb21078c1b 100644 --- a/onnxruntime/core/providers/cuda/tensor/transpose.h +++ b/onnxruntime/core/providers/cuda/tensor/transpose.h @@ -4,7 +4,7 @@ #pragma once #include "core/providers/shared_library/provider_api.h" -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_kernel.h" #include "core/providers/cpu/tensor/transpose.h" diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/precomp.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/precomp.h index 5ecc49f23748..e9df3fd20aff 100644 --- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/precomp.h +++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/precomp.h @@ -26,7 +26,7 @@ #include #include -#include "core/common/gsl.h" +#include #ifdef _GAMING_XBOX_SCARLETT #include diff --git a/onnxruntime/core/providers/dml/GraphTransformers/precomp.h b/onnxruntime/core/providers/dml/GraphTransformers/precomp.h index a2cce6baed7b..7b146e3c4d9b 100644 --- a/onnxruntime/core/providers/dml/GraphTransformers/precomp.h +++ b/onnxruntime/core/providers/dml/GraphTransformers/precomp.h @@ -14,4 +14,4 @@ #include #include -#include "core/common/gsl.h" +#include diff --git a/onnxruntime/core/providers/dml/OperatorAuthorHelper/MLOperatorAuthorHelper.h b/onnxruntime/core/providers/dml/OperatorAuthorHelper/MLOperatorAuthorHelper.h index 32079a90ea73..686cdbe774a4 100644 --- a/onnxruntime/core/providers/dml/OperatorAuthorHelper/MLOperatorAuthorHelper.h +++ b/onnxruntime/core/providers/dml/OperatorAuthorHelper/MLOperatorAuthorHelper.h @@ -5,7 +5,7 @@ #include "core/providers/dml/DmlExecutionProvider/inc/MLOperatorAuthor.h" #include "MLOperatorAuthorPrivate.h" -#include "core/common/gsl.h" +#include #include #ifdef ORT_NO_EXCEPTIONS diff --git a/onnxruntime/core/providers/dml/OperatorAuthorHelper/precomp.h b/onnxruntime/core/providers/dml/OperatorAuthorHelper/precomp.h index a64d1e01c6cc..6c47e60e63b8 100644 --- a/onnxruntime/core/providers/dml/OperatorAuthorHelper/precomp.h +++ b/onnxruntime/core/providers/dml/OperatorAuthorHelper/precomp.h @@ -17,4 +17,4 @@ #include #include -#include "core/common/gsl.h" +#include diff --git a/onnxruntime/core/providers/js/operators/conv_transpose.h b/onnxruntime/core/providers/js/operators/conv_transpose.h index 59dfbb0e9492..c51bf5ce9d4a 100644 --- a/onnxruntime/core/providers/js/operators/conv_transpose.h +++ b/onnxruntime/core/providers/js/operators/conv_transpose.h @@ -5,7 +5,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/providers/cpu/nn/conv_transpose_attributes.h" #include "core/providers/js/js_kernel.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/js/operators/transpose.h b/onnxruntime/core/providers/js/operators/transpose.h index f43dd814aa95..7a945471c770 100644 --- a/onnxruntime/core/providers/js/operators/transpose.h +++ b/onnxruntime/core/providers/js/operators/transpose.h @@ -4,7 +4,7 @@ #pragma once #include "core/providers/js/js_kernel.h" -#include "core/common/gsl.h" +#include #include "core/providers/cpu/tensor/transpose.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/helper.h b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/helper.h index d4967b625182..6f76d04a9691 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/helper.h +++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/helper.h @@ -9,7 +9,7 @@ #include "core/common/inlined_containers.h" #include "core/graph/basic_types.h" #include "core/providers/nnapi/nnapi_builtin/nnapi_lib/NeuralNetworksTypes.h" -#include "core/common/gsl.h" +#include // This is the minimal Android API Level required by ORT NNAPI EP to run // ORT running on any host system with Android API level less than this will fall back to CPU EP diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder_helpers.cc b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder_helpers.cc index c1770e0119b2..1c82d5e7452f 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder_helpers.cc +++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder_helpers.cc @@ -8,7 +8,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers_fwd.h" #include "core/common/logging/logging.h" diff --git a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc index c8bd31bde77d..f44efb1eba6d 100644 --- a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc +++ b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc @@ -13,7 +13,7 @@ // #include "GPU/QnnGpuCommon.h" #include "DSP/QnnDspCommon.h" #include "HTP/QnnHtpCommon.h" -#include "core/common/gsl.h" +#include #include "core/framework/endian_utils.h" #include "core/common/logging/capture.h" #include "core/providers/qnn/builder/onnx_ctx_model_helper.h" diff --git a/onnxruntime/core/providers/qnn/builder/qnn_quant_params_wrapper.h b/onnxruntime/core/providers/qnn/builder/qnn_quant_params_wrapper.h index 3cf04da97a8f..8fa7d414108a 100644 --- a/onnxruntime/core/providers/qnn/builder/qnn_quant_params_wrapper.h +++ b/onnxruntime/core/providers/qnn/builder/qnn_quant_params_wrapper.h @@ -5,7 +5,7 @@ #include #include "QnnTypes.h" #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "core/framework/node_unit.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/rocm/math/softmax.h b/onnxruntime/core/providers/rocm/math/softmax.h index 49bfddad36b4..57c1fc506807 100644 --- a/onnxruntime/core/providers/rocm/math/softmax.h +++ b/onnxruntime/core/providers/rocm/math/softmax.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/providers/rocm/rocm_kernel.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/rocm/miopen_common.cc b/onnxruntime/core/providers/rocm/miopen_common.cc index 6b01f02ae49b..6b08d392069a 100644 --- a/onnxruntime/core/providers/rocm/miopen_common.cc +++ b/onnxruntime/core/providers/rocm/miopen_common.cc @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "miopen_common.h" -#include "core/common/gsl.h" +#include #include "core/providers/cpu/tensor/utils.h" #include "core/providers/rocm/shared_inc/rocm_call.h" diff --git a/onnxruntime/core/providers/rocm/rocm_common.h b/onnxruntime/core/providers/rocm/rocm_common.h index 07b3e252c600..f1b40781f467 100644 --- a/onnxruntime/core/providers/rocm/rocm_common.h +++ b/onnxruntime/core/providers/rocm/rocm_common.h @@ -10,7 +10,7 @@ #include "core/providers/rocm/shared_inc/rocm_call.h" #include "core/providers/rocm/shared_inc/fast_divmod.h" #include "core/util/math.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace rocm { diff --git a/onnxruntime/core/providers/rocm/rocm_provider_factory.cc b/onnxruntime/core/providers/rocm/rocm_provider_factory.cc index 88ef666678b3..a739fe0a5d19 100644 --- a/onnxruntime/core/providers/rocm/rocm_provider_factory.cc +++ b/onnxruntime/core/providers/rocm/rocm_provider_factory.cc @@ -5,7 +5,7 @@ #include "core/providers/rocm/rocm_provider_factory.h" #include "core/providers/rocm/rocm_provider_factory_creator.h" -#include "core/common/gsl.h" +#include #include "core/providers/rocm/rocm_execution_provider.h" #include "core/providers/rocm/rocm_execution_provider_info.h" diff --git a/onnxruntime/core/providers/shared_library/provider_api.h b/onnxruntime/core/providers/shared_library/provider_api.h index 7cdfb0ffc19f..590bddabdba5 100644 --- a/onnxruntime/core/providers/shared_library/provider_api.h +++ b/onnxruntime/core/providers/shared_library/provider_api.h @@ -12,7 +12,7 @@ #include #include #include -#include "core/common/gsl.h" +#include #include #include #include diff --git a/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc b/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc index be924d6a6826..9a2d431badbb 100644 --- a/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc +++ b/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc @@ -18,7 +18,7 @@ #include "core/providers/cuda/gpu_data_transfer.h" #include "core/session/allocator_adapters.h" #include "cuda_runtime_api.h" -#include "core/common/gsl.h" +#include #include #include #include diff --git a/onnxruntime/core/providers/tvm/tvm_api.cc b/onnxruntime/core/providers/tvm/tvm_api.cc index 4c46ea5ffae7..e9a7d002e77c 100644 --- a/onnxruntime/core/providers/tvm/tvm_api.cc +++ b/onnxruntime/core/providers/tvm/tvm_api.cc @@ -16,7 +16,7 @@ #include #include "core/common/common.h" -#include "core/common/gsl.h" +#include #include "tvm_api.h" diff --git a/onnxruntime/core/providers/vitisai/imp/attr_proto.h b/onnxruntime/core/providers/vitisai/imp/attr_proto.h index f4d56dd618a8..bb2883512037 100644 --- a/onnxruntime/core/providers/vitisai/imp/attr_proto.h +++ b/onnxruntime/core/providers/vitisai/imp/attr_proto.h @@ -3,7 +3,7 @@ #pragma once #include #include "vaip/my_ort.h" -#include "core/common/gsl.h" +#include namespace vaip { diff --git a/onnxruntime/core/providers/vitisai/include/vaip/vaip_gsl.h b/onnxruntime/core/providers/vitisai/include/vaip/vaip_gsl.h index f6831604d883..def522b8a3a0 100644 --- a/onnxruntime/core/providers/vitisai/include/vaip/vaip_gsl.h +++ b/onnxruntime/core/providers/vitisai/include/vaip/vaip_gsl.h @@ -3,7 +3,7 @@ #pragma once #ifdef ONNXRUNTIME_VITISAI_EP_STUB -#include "core/common/gsl.h" +#include #else #include #endif diff --git a/onnxruntime/core/providers/xnnpack/nn/conv.cc b/onnxruntime/core/providers/xnnpack/nn/conv.cc index 0366d9f893f7..b815cc1570c9 100644 --- a/onnxruntime/core/providers/xnnpack/nn/conv.cc +++ b/onnxruntime/core/providers/xnnpack/nn/conv.cc @@ -5,7 +5,7 @@ #include -#include "core/common/gsl.h" +#include #include "core/common/inlined_containers_fwd.h" #include "core/framework/tensorprotoutils.h" #include "core/framework/transpose_helper.h" diff --git a/onnxruntime/core/session/custom_ops.cc b/onnxruntime/core/session/custom_ops.cc index 7102dbfc750e..4c782f647371 100644 --- a/onnxruntime/core/session/custom_ops.cc +++ b/onnxruntime/core/session/custom_ops.cc @@ -10,7 +10,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/data_types.h" #include "core/framework/error_code_helper.h" #include "core/framework/onnxruntime_typeinfo.h" diff --git a/onnxruntime/core/util/matrix_layout.h b/onnxruntime/core/util/matrix_layout.h index 43843da3fb96..dbf961ab5b03 100644 --- a/onnxruntime/core/util/matrix_layout.h +++ b/onnxruntime/core/util/matrix_layout.h @@ -15,7 +15,7 @@ #pragma once #include -#include "core/common/gsl.h" +#include #if defined(_MSC_VER) #define ORT_FORCEINLINE __forceinline diff --git a/onnxruntime/test/common/random_generator.h b/onnxruntime/test/common/random_generator.h index 336e0f197fcc..9ab4a82463d5 100644 --- a/onnxruntime/test/common/random_generator.h +++ b/onnxruntime/test/common/random_generator.h @@ -8,7 +8,7 @@ #include "gtest/gtest.h" -#include "core/common/gsl.h" +#include #include "core/common/common.h" #include "core/common/optional.h" #include "core/common/type_utils.h" diff --git a/onnxruntime/test/common/tensor_op_test_utils.h b/onnxruntime/test/common/tensor_op_test_utils.h index b831507988da..e0891c7ced63 100644 --- a/onnxruntime/test/common/tensor_op_test_utils.h +++ b/onnxruntime/test/common/tensor_op_test_utils.h @@ -6,7 +6,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "gtest/gtest.h" diff --git a/onnxruntime/test/contrib_ops/beam_search_test.cc b/onnxruntime/test/contrib_ops/beam_search_test.cc index 6ce9f5de68f1..5f94d30112f0 100644 --- a/onnxruntime/test/contrib_ops/beam_search_test.cc +++ b/onnxruntime/test/contrib_ops/beam_search_test.cc @@ -4,7 +4,7 @@ #include #include #include "gtest/gtest.h" -#include "core/common/gsl.h" +#include #include "core/session/onnxruntime_cxx_api.h" #include "test/common/cuda_op_test_utils.h" diff --git a/onnxruntime/test/contrib_ops/greedy_search_test.cc b/onnxruntime/test/contrib_ops/greedy_search_test.cc index 73da82d4bb03..79070f0788f2 100644 --- a/onnxruntime/test/contrib_ops/greedy_search_test.cc +++ b/onnxruntime/test/contrib_ops/greedy_search_test.cc @@ -4,7 +4,7 @@ #include #include #include "gtest/gtest.h" -#include "core/common/gsl.h" +#include #include "core/session/onnxruntime_cxx_api.h" #include "test/common/cuda_op_test_utils.h" diff --git a/onnxruntime/test/contrib_ops/sampling_test.cc b/onnxruntime/test/contrib_ops/sampling_test.cc index d987a1cae427..69789b84832e 100644 --- a/onnxruntime/test/contrib_ops/sampling_test.cc +++ b/onnxruntime/test/contrib_ops/sampling_test.cc @@ -4,7 +4,7 @@ #include #include #include "gtest/gtest.h" -#include "core/common/gsl.h" +#include #include "core/session/onnxruntime_cxx_api.h" #include "test/common/cuda_op_test_utils.h" diff --git a/onnxruntime/test/framework/test_utils.h b/onnxruntime/test/framework/test_utils.h index 0a99b4bc8021..51b02ee3e7f8 100644 --- a/onnxruntime/test/framework/test_utils.h +++ b/onnxruntime/test/framework/test_utils.h @@ -9,7 +9,7 @@ #include "core/providers/cpu/cpu_execution_provider.h" #include "core/framework/ort_value.h" -#include "core/common/gsl.h" +#include #ifdef USE_CUDA #include "core/providers/providers.h" diff --git a/onnxruntime/test/optimizer/initializer_test.cc b/onnxruntime/test/optimizer/initializer_test.cc index 9e55d9b2ef92..522e96e762d5 100644 --- a/onnxruntime/test/optimizer/initializer_test.cc +++ b/onnxruntime/test/optimizer/initializer_test.cc @@ -8,7 +8,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "gtest/gtest.h" diff --git a/onnxruntime/test/platform/file_io_test.cc b/onnxruntime/test/platform/file_io_test.cc index 3611e3b33446..ccc703716844 100644 --- a/onnxruntime/test/platform/file_io_test.cc +++ b/onnxruntime/test/platform/file_io_test.cc @@ -14,7 +14,7 @@ #include #endif -#include "core/common/gsl.h" +#include #include "gtest/gtest.h" diff --git a/onnxruntime/test/providers/cpu/ml/array_feature_extractor_test.cc b/onnxruntime/test/providers/cpu/ml/array_feature_extractor_test.cc index f7b8a61f48da..c7fc73456dcb 100644 --- a/onnxruntime/test/providers/cpu/ml/array_feature_extractor_test.cc +++ b/onnxruntime/test/providers/cpu/ml/array_feature_extractor_test.cc @@ -5,7 +5,7 @@ #include "gtest/gtest.h" #include "test/providers/provider_test_utils.h" -#include "core/common/gsl.h" +#include using namespace std; namespace onnxruntime { namespace test { diff --git a/onnxruntime/test/providers/cpu/tensor/cast_op_test.cc b/onnxruntime/test/providers/cpu/tensor/cast_op_test.cc index 4c77908322df..421561a5a859 100644 --- a/onnxruntime/test/providers/cpu/tensor/cast_op_test.cc +++ b/onnxruntime/test/providers/cpu/tensor/cast_op_test.cc @@ -5,7 +5,7 @@ #include "boost/mp11.hpp" -#include "core/common/gsl.h" +#include #include "gtest/gtest.h" diff --git a/onnxruntime/test/providers/cpu/tensor/where_op_test.cc b/onnxruntime/test/providers/cpu/tensor/where_op_test.cc index 6237521b34df..03db49a313af 100644 --- a/onnxruntime/test/providers/cpu/tensor/where_op_test.cc +++ b/onnxruntime/test/providers/cpu/tensor/where_op_test.cc @@ -3,7 +3,7 @@ #include "gtest/gtest.h" -#include "core/common/gsl.h" +#include #include "test/providers/provider_test_utils.h" diff --git a/onnxruntime/test/providers/cuda/test_cases/cuda_test_provider.cc b/onnxruntime/test/providers/cuda/test_cases/cuda_test_provider.cc index d8384b432786..022c6250138d 100644 --- a/onnxruntime/test/providers/cuda/test_cases/cuda_test_provider.cc +++ b/onnxruntime/test/providers/cuda/test_cases/cuda_test_provider.cc @@ -10,7 +10,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/providers/cuda/cuda_execution_provider.h" #include "core/providers/cuda/cuda_execution_provider_info.h" #include "core/providers/cuda/cuda_allocator.h" diff --git a/onnxruntime/test/shared_lib/test_inference.cc b/onnxruntime/test/shared_lib/test_inference.cc index 58c185f818df..eacd41e6b9c6 100644 --- a/onnxruntime/test/shared_lib/test_inference.cc +++ b/onnxruntime/test/shared_lib/test_inference.cc @@ -31,7 +31,7 @@ #include "test_fixture.h" #include "utils.h" #include "custom_op_utils.h" -#include "core/common/gsl.h" +#include #ifdef _WIN32 #include diff --git a/onnxruntime/test/shared_lib/test_nontensor_types.cc b/onnxruntime/test/shared_lib/test_nontensor_types.cc index e8160d1619cb..5fa4fb31e1c9 100644 --- a/onnxruntime/test/shared_lib/test_nontensor_types.cc +++ b/onnxruntime/test/shared_lib/test_nontensor_types.cc @@ -9,7 +9,7 @@ #include "core/session/onnxruntime_cxx_api.h" #include "test_allocator.h" -#include "core/common/gsl.h" +#include #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/onnxruntime/test/testdata/custom_execution_provider_library/my_ep_factory.cc b/onnxruntime/test/testdata/custom_execution_provider_library/my_ep_factory.cc index 6a2d27ee9517..2d7d8e7cc735 100644 --- a/onnxruntime/test/testdata/custom_execution_provider_library/my_ep_factory.cc +++ b/onnxruntime/test/testdata/custom_execution_provider_library/my_ep_factory.cc @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "my_ep_factory.h" #include "my_execution_provider.h" -#include "core/common/gsl.h" +#include #include "core/providers/shared/common.h" #include #include "core/framework/provider_options_utils.h" diff --git a/onnxruntime/test/util/include/test_utils.h b/onnxruntime/test/util/include/test_utils.h index 48f0d7c2ab1f..f55295ac8aec 100644 --- a/onnxruntime/test/util/include/test_utils.h +++ b/onnxruntime/test/util/include/test_utils.h @@ -11,7 +11,7 @@ #include #include -#include "core/common/gsl.h" +#include #include "core/framework/execution_provider.h" #include "core/framework/framework_common.h" #include "core/framework/ort_value.h" diff --git a/orttraining/orttraining/core/optimizer/graph_transformer_utils.h b/orttraining/orttraining/core/optimizer/graph_transformer_utils.h index 011a007ab6e7..5196f5256fed 100644 --- a/orttraining/orttraining/core/optimizer/graph_transformer_utils.h +++ b/orttraining/orttraining/core/optimizer/graph_transformer_utils.h @@ -3,7 +3,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include "core/optimizer/graph_transformer.h" #include "orttraining/core/optimizer/graph_transformer_config.h" diff --git a/orttraining/orttraining/test/training_api/common/synthetic_data_loader.h b/orttraining/orttraining/test/training_api/common/synthetic_data_loader.h index 542acb2e337a..2340104840a6 100644 --- a/orttraining/orttraining/test/training_api/common/synthetic_data_loader.h +++ b/orttraining/orttraining/test/training_api/common/synthetic_data_loader.h @@ -11,7 +11,7 @@ #pragma once -#include "core/common/gsl.h" +#include #include diff --git a/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc b/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc index f42fa0c4dc98..d3f2f9c7a876 100644 --- a/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc +++ b/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc @@ -3,7 +3,7 @@ #include "orttraining/training_ops/cpu/activation/activations_grad.h" -#include "core/common/gsl.h" +#include #if defined(_MSC_VER) #pragma warning(push) diff --git a/orttraining/orttraining/training_ops/cpu/loss/cross_entropy.cc b/orttraining/orttraining/training_ops/cpu/loss/cross_entropy.cc index 9aad7edf68bf..3dd52f36ec72 100644 --- a/orttraining/orttraining/training_ops/cpu/loss/cross_entropy.cc +++ b/orttraining/orttraining/training_ops/cpu/loss/cross_entropy.cc @@ -7,7 +7,7 @@ #include "core/providers/common.h" #include #include "core/providers/cpu/math/matmul_helper.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/orttraining/orttraining/training_ops/cpu/loss/softmax_cross_entropy_loss.cc b/orttraining/orttraining/training_ops/cpu/loss/softmax_cross_entropy_loss.cc index b3c04af1a265..c74bf06a77d6 100644 --- a/orttraining/orttraining/training_ops/cpu/loss/softmax_cross_entropy_loss.cc +++ b/orttraining/orttraining/training_ops/cpu/loss/softmax_cross_entropy_loss.cc @@ -10,7 +10,7 @@ #include "core/providers/cpu/controlflow/scan_utils.h" #include "orttraining/training_ops/cpu/loss/cross_entropy.h" #include "orttraining/training_ops/cpu/loss/softmax_cross_entropy_loss.h" -#include "core/common/gsl.h" +#include namespace onnxruntime { namespace contrib { diff --git a/orttraining/orttraining/training_ops/cpu/op_gradients.cc b/orttraining/orttraining/training_ops/cpu/op_gradients.cc index c3476161c1e5..f4b9c08bd90c 100644 --- a/orttraining/orttraining/training_ops/cpu/op_gradients.cc +++ b/orttraining/orttraining/training_ops/cpu/op_gradients.cc @@ -3,7 +3,7 @@ #include "orttraining/training_ops/cpu/op_gradients.h" -#include "core/common/gsl.h" +#include #include "core/mlas/inc/mlas.h" #include "core/providers/common.h" #include "core/providers/cpu/math/element_wise_ops.h" diff --git a/orttraining/orttraining/training_ops/cpu/tensor/split.cc b/orttraining/orttraining/training_ops/cpu/tensor/split.cc index d361f3ec64e3..1edfdac7631e 100644 --- a/orttraining/orttraining/training_ops/cpu/tensor/split.cc +++ b/orttraining/orttraining/training_ops/cpu/tensor/split.cc @@ -3,7 +3,7 @@ #include "orttraining/training_ops/cpu/tensor/split.h" -#include "core/common/gsl.h" +#include #include "core/common/narrow.h" #include "core/providers/common.h" #include "core/util/math.h" diff --git a/winml/lib/Api.Ort/OnnxruntimeEngine.h b/winml/lib/Api.Ort/OnnxruntimeEngine.h index eae7dc37941c..88945b75c75e 100644 --- a/winml/lib/Api.Ort/OnnxruntimeEngine.h +++ b/winml/lib/Api.Ort/OnnxruntimeEngine.h @@ -3,7 +3,7 @@ #include "iengine.h" #include "UniqueOrtPtr.h" -#include "core/common/gsl.h" +#include #include #include