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

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "gsl/gsl"

include/onnxruntime/core/common/logging/capture.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <cstdarg>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/common.h"
 #include "core/common/code_location.h"
 #include "core/common/logging/severity.h"

include/onnxruntime/core/common/span_utils.h

@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <cstddef>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 namespace onnxruntime {
 

include/onnxruntime/core/framework/data_types.h

@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <map>
 #include <unordered_map>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/common.h"
 #include "core/common/exceptions.h"
 #include "core/framework/endian.h"

include/onnxruntime/core/framework/int4.h

@@ -6,7 +6,7 @@
 #include <cassert>
 #include <type_traits>
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 namespace onnxruntime {
 

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 <gsl/gsl>
 namespace onnxruntime {
 class OpKernelContext;
 }

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 <gsl/gsl>
 
 namespace onnxruntime {
 

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 <gsl/gsl>
 #endif
 
 class IMLOpKernel;

include/onnxruntime/core/framework/tensor.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/common.h"
 #include "core/framework/allocator.h"
 #include "core/framework/tensor_shape.h"

include/onnxruntime/core/framework/tensor_shape.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers_fwd.h"
 #include "core/common/span_utils.h"
 #include "onnxruntime_config.h"

include/onnxruntime/core/graph/graph.h

@@ -14,7 +14,7 @@
 
 #include "core/common/flatbuffers.h"
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/common/path_string.h"

onnxruntime/contrib_ops/cpu/attnlstm/attention_mechanism.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 namespace onnxruntime {
 namespace contrib {

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace contrib {

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace contrib {

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace contrib {

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/beam_search.h"
 #include "contrib_ops/cpu/transformers/logits_processor.h"
 #include "contrib_ops/cpu/transformers/sequences.h"

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 <gsl/gsl>
 #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"

onnxruntime/contrib_ops/cpu/transformers/generation_device_helper.h

@@ -10,7 +10,7 @@
 #endif
 
 #include <vector>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "contrib_ops/cpu/transformers/logits_processor.h"
 #include "contrib_ops/cpu/transformers/generation_shared.h"
 

onnxruntime/contrib_ops/cpu/transformers/generation_shared.h

@@ -5,7 +5,7 @@
 
 #include <utility>
 #include <random>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/allocator.h"
 #include "core/framework/ort_value.h"
 #include "contrib_ops/cpu/utils/debug_macros.h"

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/greedy_search.h"
 #include "contrib_ops/cpu/transformers/logits_processor.h"
 #include "contrib_ops/cpu/transformers/sequences.h"

onnxruntime/contrib_ops/cpu/transformers/sequences.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "contrib_ops/cpu/transformers/generation_shared.h"
 
 namespace onnxruntime {

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/subgraph_base.h"
 #include "contrib_ops/cpu/utils/dump_tensor.h"
 

onnxruntime/contrib_ops/cpu/transformers/subgraph_base.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 #include <string>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/allocator.h"
 #include "core/framework/feeds_fetches_manager.h"
 #include "contrib_ops/cpu/transformers/generation_device_helper.h"

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/subgraph_gpt.h"
 #include "contrib_ops/cpu/utils/dump_tensor.h"
 

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 <gsl/gsl>
 #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"

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/subgraph_t5_encoder.h"
 
 namespace onnxruntime {

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 <gsl/gsl>
 #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"

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/subgraph_t5_encoder.h"
 #include "contrib_ops/cpu/transformers/subgraph_whisper_encoder.h"
 

onnxruntime/contrib_ops/cuda/bert/attention_impl.h

@@ -5,7 +5,7 @@
 
 #include <cuda_fp16.h>
 #include <cublas_v2.h>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/allocator.h"
 #include "contrib_ops/cpu/bert/attention_common.h"
 

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 <gsl/gsl>
 #include "core/framework/tensor_shape.h"
 
 #include <cctype>

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 <gsl/gsl>
 #include "contrib_ops/cpu/transformers/sequences.h"
 #include "contrib_ops/cpu/transformers/generation_shared.h"
 

onnxruntime/core/codegen/mti/mti_tvm_utils.h

@@ -5,7 +5,7 @@
 
 #include <string>
 #include <vector>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include <tvm/tvm.h>
 #include "core/codegen/mti/common.h"
 

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 <gsl/gsl>
 #include <topi/transform.h>
 
 namespace onnxruntime {

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 <gsl/gsl>
 #include <topi/transform.h>
 
 namespace onnxruntime {

onnxruntime/core/codegen/mti/tensor/slice.cc

@@ -5,7 +5,7 @@
 
 #include "core/codegen/mti/mti_tvm_utils.h"
 #include <climits>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include <topi/transform.h>
 #include <tvm/ir_pass.h>
 

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 <gsl/gsl>
 #include <topi/transform.h>
 
 namespace onnxruntime {

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace tvm_codegen {

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 <gsl/gsl>
 
 #include <topi/detail/extern.h>
 

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace logging {

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 <gsl/gsl>
 #include "core/flatbuffers/schema/ort.fbs.h"
 #include "core/graph/constants.h"
 #include "core/graph/onnx_protobuf.h"

onnxruntime/core/framework/data_transfer_utils.h

@@ -5,7 +5,7 @@
 
 #include <type_traits>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/framework/tensor.h"

onnxruntime/core/framework/endian_utils.h

@@ -5,7 +5,7 @@
 
 #include <type_traits>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/status.h"
 #include "core/common/common.h"

onnxruntime/core/framework/fallback_cpu_capability.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers_fwd.h"
 #include "core/framework/execution_provider.h"  // for IExecutionProvider::IKernelLookup
 #include "core/graph/graph_viewer.h"

onnxruntime/core/framework/kernel_lookup.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/execution_provider.h"  // for IExecutionProvider::IKernelLookup
 #include "core/framework/kernel_registry.h"
 #include "core/framework/kernel_type_str_resolver.h"

onnxruntime/core/framework/kernel_registry_manager.h

@@ -7,7 +7,7 @@
 #include <variant>
 #include <unordered_map>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/common/status.h"
 #include "core/framework/kernel_type_str_resolver.h"

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 <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/common/status.h"
 #include "core/graph/op_identifier.h"

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 <gsl/gsl>
 #include "core/common/status.h"
 #include "core/framework/kernel_type_str_resolver.h"
 #include "core/graph/op_identifier.h"

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 <gsl/gsl>
 
 using namespace ONNX_NAMESPACE;
 using namespace ::onnxruntime::common;

onnxruntime/core/framework/session_options.h

@@ -8,7 +8,7 @@
 #include <iostream>
 #include <codecvt>
 #include <filesystem>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/framework/config_options.h"
 #include "core/framework/ort_value.h"

onnxruntime/core/framework/session_state.h

@@ -10,7 +10,7 @@
 
 #include "core/common/flatbuffers.h"
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/common/inlined_containers.h"

onnxruntime/core/framework/tensorprotoutils.cc

@@ -11,7 +11,7 @@
 #include <emscripten.h>
 #endif
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/logging/logging.h"
 #include "core/common/narrow.h"
 #include "core/common/span_utils.h"

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 <gsl/gsl>
 
 namespace onnxruntime {
 bool IsTransposeMovingSingleAxis(gsl::span<const size_t> permutations, size_t& from, size_t& to);

onnxruntime/core/graph/graph.cc

@@ -11,7 +11,7 @@
 #include <queue>
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/common/logging/logging.h"
 #include "core/common/narrow.h"

onnxruntime/core/graph/model.cc

@@ -20,7 +20,7 @@
 #endif
 #include "core/util/protobuf_parsing_utils.h"
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/platform/env.h"
 

onnxruntime/core/graph/node_attr_utils.h

@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/graph/onnx_protobuf.h"
 #include "core/graph/basic_types.h"

onnxruntime/core/graph/runtime_optimization_record_container.cc

@@ -7,7 +7,7 @@
 
 #include <algorithm>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/flatbuffers/flatbuffers_utils.h"
 #include "core/flatbuffers/schema/ort.fbs.h"

onnxruntime/core/optimizer/free_dim_override_transformer.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/optimizer/graph_transformer.h"

onnxruntime/core/optimizer/initializer.cc

@@ -6,7 +6,7 @@
 #include <functional>
 #include <memory>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/tensorprotoutils.h"
 #include "core/framework/tensor_external_data_info.h"
 #include "core/platform/env.h"

onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h

@@ -5,7 +5,7 @@
 
 #include <string>
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/framework/node_unit.h"
 #include "core/graph/basic_types.h"

onnxruntime/core/optimizer/selectors_actions/actions.h

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #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"

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 <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/graph/graph.h"
 #include "core/graph/runtime_optimization_record.h"

onnxruntime/core/optimizer/transpose_optimization/onnx_transpose_optimization.cc

@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/make_string.h"
 #include "core/graph/constants.h"
 

onnxruntime/core/platform/env.h

@@ -22,7 +22,7 @@ limitations under the License.
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/common/path_string.h"

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 <gsl/gsl>
 #include "core/common/logging/logging.h"
 #include "core/common/narrow.h"
 #include "core/platform/scoped_resource.h"

onnxruntime/core/platform/windows/env.cc

@@ -26,7 +26,7 @@ limitations under the License.
 #include <fcntl.h>
 #include <io.h>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/logging/logging.h"
 #include "core/common/narrow.h"
 #include "core/common/span_utils.h"

onnxruntime/core/platform/windows/stacktrace.cc

@@ -12,7 +12,7 @@
 #endif
 
 #include "core/common/logging/logging.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 namespace onnxruntime {
 

onnxruntime/core/providers/coreml/builders/impl/builder_utils.h

@@ -7,7 +7,7 @@
 
 #include <optional>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/status.h"
 #include "core/graph/basic_types.h"
 #include "core/providers/common.h"

onnxruntime/core/providers/coreml/model/model.h

@@ -8,7 +8,7 @@
 #include <unordered_set>
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/logging/logging.h"
 #include "core/common/status.h"
 #include "core/platform/ort_mutex.h"

onnxruntime/core/providers/coreml/model/model.mm

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/inlined_containers.h"
 #include "core/common/logging/logging.h"
 #include "core/common/narrow.h"

onnxruntime/core/providers/coreml/shape_utils.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/logging/logging.h"
 #include "core/graph/node_arg.h"
 

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 <gsl/gsl>
 
 #ifdef _MSC_VER
 #pragma warning(pop)

onnxruntime/core/providers/cpu/controlflow/scan.h

@@ -3,7 +3,7 @@
 
 #pragma once
 #include <functional>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #ifndef SHARED_PROVIDER
 #include "core/common/common.h"

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 <gsl/gsl>
 
 #ifdef _MSC_VER
 #pragma warning(pop)

onnxruntime/core/providers/cpu/generator/random.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <random>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/framework/op_kernel.h"

onnxruntime/core/providers/cpu/math/hardmax.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/framework/op_kernel.h"

onnxruntime/core/providers/cpu/math/sign.cc

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/framework/data_types.h"

onnxruntime/core/providers/cpu/math/softmax.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/framework/op_kernel.h"

onnxruntime/core/providers/cpu/math/softmax_shared.cc

@@ -22,7 +22,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/util/math.h"
 #include "core/util/math_cpuonly.h"

onnxruntime/core/providers/cpu/ml/cast_map.cc

@@ -3,7 +3,7 @@
 
 #include "core/providers/cpu/ml/cast_map.h"
 #include <algorithm>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 using namespace ::onnxruntime::common;
 
 namespace {

onnxruntime/core/providers/cpu/ml/category_mapper.cc

@@ -3,7 +3,7 @@
 
 #include "core/providers/cpu/ml/category_mapper.h"
 #include <algorithm>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 using namespace ::onnxruntime::common;
 
 namespace onnxruntime {

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace ml {

onnxruntime/core/providers/cpu/ml/label_encoder.cc

@@ -3,7 +3,7 @@
 
 #include "core/providers/cpu/ml/label_encoder.h"
 #include <algorithm>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 using namespace ::onnxruntime::common;
 
 namespace onnxruntime {

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 <gsl/gsl>
 #include "core/providers/cpu/tensor/utils.h"
 #include "core/providers/common.h"
 

onnxruntime/core/providers/cpu/nn/lrn.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/common/exceptions.h"

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace rnn {

onnxruntime/core/providers/cpu/tensor/cast_op.cc

@@ -6,7 +6,7 @@
 #include <string>
 #include <type_traits>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/common/common.h"
 #include "core/common/narrow.h"

onnxruntime/core/providers/cpu/tensor/mean_variance_normalization.cc

@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <optional>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/providers/common.h"
 #include "core/providers/cpu/tensor/transpose.h"
 #include "core/util/math_cpuonly.h"

onnxruntime/core/providers/cpu/tensor/reverse_sequence.cc

@@ -11,7 +11,7 @@
 #pragma warning(disable : 4996)
 #endif
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #ifdef _MSC_VER
 #pragma warning(pop)

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 <gsl/gsl>
 #include <limits>
 
 namespace onnxruntime {

onnxruntime/core/providers/cpu/tensor/slice_compute_metadata.h

@@ -6,7 +6,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/tensor_shape.h"
 
 namespace onnxruntime {

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 <gsl/gsl>
 #include "core/common/safeint.h"
 #include "core/framework/copy.h"
 #include "core/framework/element_type_lists.h"

onnxruntime/core/providers/cpu/tensor/transpose.h

@@ -10,7 +10,7 @@
 #include "core/framework/op_kernel.h"
 #endif
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include <sstream>
 
 namespace onnxruntime {

onnxruntime/core/providers/cpu/tensor/unique.cc

@@ -4,7 +4,7 @@
 #include "core/providers/cpu/tensor/unique.h"
 #include <map>
 #include <core/common/safeint.h>
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/framework/op_kernel_type_control_utils.h"
 #include "core/providers/common.h"
 #include "core/providers/op_kernel_type_control.h"

onnxruntime/core/providers/cpu/tensor/utils.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/common/narrow.h"
 
 #ifndef SHARED_PROVIDER

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 <gsl/gsl>
 
 namespace onnxruntime {
 namespace cuda {

onnxruntime/core/providers/cuda/cuda_provider_factory.cc

@@ -10,7 +10,7 @@
 #include <memory>
 #include <chrono>
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/providers/cuda/cuda_execution_provider.h"
 #include "core/providers/cuda/cuda_execution_provider_info.h"

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 <gsl/gsl>
 #include "shared_inc/cuda_call.h"
 #include "core/providers/cpu/tensor/utils.h"
 #ifndef USE_CUDA_MINIMAL

onnxruntime/core/providers/cuda/math/softmax.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 #include "core/providers/cuda/cuda_kernel.h"
 
 namespace onnxruntime {

onnxruntime/core/providers/cuda/multi_tensor/common.cuh

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "core/common/common.h"
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 namespace onnxruntime {
 namespace cuda {

onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/common/gsl.h"
+#include <gsl/gsl>
 
 #include "core/providers/cuda/cuda_kernel.h"
 #include "core/providers/cuda/cudnn_common.h"