Merge branch 'main' into Cjian/iconv_mac

# Conflicts:
#	onnxruntime/core/providers/cpu/nn/string_normalizer.cc

.clang-format

@@ -7,6 +7,9 @@ BasedOnStyle:  Google
 ColumnLimit:     0
 SortIncludes: false
 DerivePointerAlignment: false
+# Avoid adding spaces between tokens in GSL_SUPPRESS arguments.
+# E.g., don't change "GSL_SUPPRESS(r.11)" to "GSL_SUPPRESS(r .11)".
+WhitespaceSensitiveMacros: ["GSL_SUPPRESS"]
 
 # if you want to customize when working locally see https://clang.llvm.org/docs/ClangFormatStyleOptions.html for options.
 # See ReformatSource.ps1 for a script to update all source according to the current options in this file.

.gdn/.gdntsa

@@ -1,3 +1,3 @@
 {
-    "codebaseName": "onnxruntime_master"
+    "codebaseName": "onnxruntime_main"
 }

.github/ISSUE_TEMPLATE/04-web.yml

@@ -55,8 +55,10 @@ body:
     attributes:
       label: Execution Provider
       options:
-        - WebGL
-        - WASM
+        - "'webgl' (WebGL)"
+        - "'wasm'/'cpu' (WebAssembly CPU)"
+        - "'xnnpack' (WebAssembly XNNPACK)"
+        - "'webgpu' (WebGPU)"
         - Other / Unknown
       multiple: yes
     validations:

.github/workflows/cffconvert.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out a copy of the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check whether the citation metadata from CITATION.cff is valid
         uses: citation-file-format/[email protected]

.github/workflows/codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/gradle-wrapper-validation.yml

@@ -10,5 +10,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

.github/workflows/labeler.yml

@@ -7,7 +7,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v2.5
+    - uses: github/issue-labeler@v3.2
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/labeler.yml

.github/workflows/lint.yml

@@ -3,16 +3,16 @@ name: Lint
 on:
   push:
     branches:
-      - master
       - main
+      - rel-*
   pull_request:
 
 jobs:
   optional-lint:
     name: Optional Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: misspell # Check spellings as well
         uses: reviewdog/action-misspell@v1
         with:
@@ -34,7 +34,7 @@ jobs:
     name: Python format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -100,7 +100,7 @@ jobs:
     name: Lint JavaScript
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: reviewdog/action-eslint@v1
         with:
           reporter: github-pr-check

.github/workflows/linux.yml

@@ -2,18 +2,22 @@ name: Linux_CI
 on:
   push:
     branches:
-      - master
       - main
+      - rel-*
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   Onnxruntime-TVM:
     runs-on: ubuntu-latest
     steps:
-       - uses: actions/checkout@v3
+       - uses: actions/checkout@v4
          with:
            submodules: true
-       - uses: actions/setup-python@v3
+       - uses: actions/setup-python@v4
          with:
            python-version: '3.8.x'
            architecture: 'x64'

.github/workflows/publish-c-apidocs.yml

@@ -6,8 +6,8 @@ on:
     branches:
       - main
     paths:
-      - include/onnxruntime/core/session
-      - orttraining/orttraining/training_api/include/
+      - include/onnxruntime/core/session/**
+      - orttraining/orttraining/training_api/include/**
   schedule:
     - cron: '0 0 1 * *'
   workflow_dispatch:
@@ -24,19 +24,19 @@ jobs:
     name: Generate C/C++ API docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install doxygen and dependencies
         run: |
           sudo apt update
           sudo apt-get install libclang-dev
           sudo apt-get install libclang-cpp14
-          wget https://www.doxygen.nl/files/doxygen-1.9.6.linux.bin.tar.gz
-          tar xvzf doxygen-1.9.6.linux.bin.tar.gz
+          wget https://www.doxygen.nl/files/doxygen-1.9.8.linux.bin.tar.gz
+          tar xvzf doxygen-1.9.8.linux.bin.tar.gz
       - name: Run doxygen
         run: |
           mkdir -p build/doxygen
           cd docs/c_cxx
-          ../../doxygen-1.9.6/bin/doxygen
+          ../../doxygen-1.9.8/bin/doxygen
       - name: Log source commit
         run: git rev-parse --short HEAD > build/doxygen/html/source-version.txt
       - name: Move C/C++ docs into site

.github/workflows/publish-csharp-apidocs.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - main
     paths:
-      - csharp
+      - csharp/**
   schedule:
     - cron: '0 0 1 * *'
   workflow_dispatch:
@@ -24,11 +24,11 @@ jobs:
     env:
       DOCFXVERSION: 2.62.2
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore csharp/ApiDocs/ApiDocs.csproj
     - name: Download DocFX

.github/workflows/publish-gh-pages.yml

@@ -1,101 +1,16 @@
-# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+# This is a placeholder workflow only. Its purpose is for manual runs to show up
+# in the GitHub web UI. It is not used for any automated runs.
 name: Publish site
 
 on:
-  # Runs on pushes targeting the branch where the website sources live
-  push:
-    branches: ["gh-pages"]
-
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
 jobs:
-  # Build job
-  build:
+  placeholder:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: gh-pages
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./
-          destination: ./_site
-
-      - name: Download C apidocs artifact
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: onnxruntime-c-apidocs
-          workflow: publish-c-apidocs.yml
-          branch: main
-          path: apidocs
-
-      - name: Download C# apidocs artifact
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: onnxruntime-csharp-apidocs
-          workflow: publish-csharp-apidocs.yml
-          branch: main
-          path: apidocs
-
-      - name: Download Java apidocs artifact
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: onnxruntime-java-apidocs
-          workflow: publish-java-apidocs.yml
-          branch: main
-          path: apidocs
-
-      - name: Download Python apidocs artifact
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: onnxruntime-python-apidocs
-          workflow: publish-python-apidocs.yml
-          branch: main
-          path: apidocs
-
-      - name: Move apidocs folder into place
+      - name: Placeholder step to have workflow included in the GitHub web UI
         run: |
-          sudo rm -rf _site/docs/api/c
-          sudo mv apidocs/docs/api/c _site/docs/api
-          sudo rm -rf _site/docs/api/csharp
-          sudo mv apidocs/docs/api/csharp _site/docs/api
-          sudo rm -rf _site/docs/api/java
-          sudo mv apidocs/docs/api/java _site/docs/api
-          sudo rm -rf _site/docs/api/python
-          sudo mv apidocs/docs/api/python _site/docs/api
-
-      - name: Upload site
-        uses: actions/upload-pages-artifact@v1
-        with:
-          retention-days: 21
-
-  # Deployment job
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1
+          echo "Placeholder step to have workflow included in the GitHub web UI"
+          echo "The actual publish workflow is run from the gh-pages branch"

.github/workflows/publish-java-apidocs.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - main
     paths:
-      - java
+      - java/**
   schedule:
     - cron: '0 0 1 * *'
   workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
     name: Generate Java docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

.github/workflows/publish-js-apidocs.yml

@@ -0,0 +1,50 @@
+name: Update JS API Docs
+
+# Run when the JS API changes or every month so that the artifact does not expire
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - js/common/**
+  schedule:
+    - cron: '0 0 1 * *'
+  workflow_dispatch:
+
+concurrency:
+  group: "apidocs-js"
+  cancel-in-progress: false
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    name: Generate JS API docs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Generate JS docs 
+        run: |
+          cd js/
+          npm ci
+          cd common/
+          npm ci
+          npx typedoc
+      - name: Log source commit
+        run: git rev-parse --short HEAD > js/common/docs/source-version.txt
+      - name: Move JS docs into site
+        run: |
+          rm -rf _site/docs/api/js
+          mkdir -p _site/docs/api
+          mv js/common/docs _site/docs/api/js
+      - name: Upload docs artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: onnxruntime-node-apidocs
+          path: _site
+          retention-days: 60

.github/workflows/publish-objectivec-apidocs.yml

@@ -6,7 +6,7 @@ on:
     branches:
     - main
     paths:
-    - objectivec
+    - objectivec/**
   schedule:
   - cron: '0 0 1 * *'
   workflow_dispatch:
@@ -21,9 +21,9 @@ permissions:
 jobs:
   build:
     name: Generate Objective-C API docs
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install Jazzy
       run: |