Conflicts resolution

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+  # Maintain dependencies for Git Submodules
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/macos.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build-macos:
     name: MacOS CPU-only
-    runs-on: macos-10.15
+    runs-on: macos-12
 
     steps:
     - name: Checkout
@@ -20,10 +20,6 @@ jobs:
     - name: Install dependencies
       run: brew install boost openblas openssl protobuf
 
-    # Openblas location is exported explicitly because openblas is keg-only,
-    # which means it was not symlinked into /usr/local/.
-    # CMake cannot find BLAS on GitHub runners if Marian is being compiled
-    # statically, hence USE_STATIC_LIBS=off
     - name: Configure CMake
       run: |
         export LDFLAGS="-L/usr/local/opt/openblas/lib"
@@ -34,11 +30,10 @@ jobs:
           -DCOMPILE_CPU=on \
           -DCOMPILE_CUDA=off \
           -DCOMPILE_EXAMPLES=on \
-          -DCOMPILE_SERVER=on \
+          -DCOMPILE_SERVER=off \
           -DCOMPILE_TESTS=on \
           -DUSE_FBGEMM=on \
-          -DUSE_SENTENCEPIECE=on \
-          -DUSE_STATIC_LIBS=off
+          -DUSE_SENTENCEPIECE=on
 
     - name: Compile
       working-directory: build
@@ -55,4 +50,4 @@ jobs:
         ./marian-decoder --version
         ./marian-scorer --version
         ./spm_encode --version
-
+        ls -hlv $(find . -maxdepth 1 -type f -perm +ugo+x \( -name "marian*" -o -name "spm*" \))

.github/workflows/release.yml

@@ -29,7 +29,7 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+*"
 
 env:
-  cuda_version: "10.2"
+  cuda_version: "11.2"
   gcc_version: 8
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
             fbgemm: false
             cuda: false
           - name: "Build Ubuntu CPU+CUDA"
-            suffix: cuda10.2
+            suffix: cuda11.2
             fbgemm: false
             cuda: true
 
@@ -59,8 +59,8 @@ jobs:
         # Get the tag name only to use it in the archive name. The variable github.ref can not be used because it starts with refs/tags/
         TAG_NAME=$(echo ${{ github.ref }} | cut -d/ -f3-)
         # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
-        echo "::set-env name=github_tag_name::${TAG_NAME}"
-        echo "::set-env name=archive_name::${{ github.event.repository.name }}-${TAG_NAME}_linux-x64-static_${{ matrix.suffix }}"
+        echo "github_tag_name=${TAG_NAME}" >> $GITHUB_ENV
+        echo "archive_name=${{ github.event.repository.name }}-${TAG_NAME}_linux-x64-static_${{ matrix.suffix }}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout
@@ -72,7 +72,7 @@ jobs:
     # No need to install libprotobuf{17,10,9v5} on Ubuntu {20,18,16}.04 because it is installed together with libprotobuf-dev
     # Boost is no longer pre-installed on GitHub-hosted runners
     - name: Install dependencies
-      run: sudo apt-get install -y libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev
+      run: sudo apt-get install -y libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev gcc-${{ env.gcc_version }} g++-${{ env.gcc_version }}
 
     # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html
     - name: Install MKL
@@ -133,7 +133,7 @@ jobs:
             fbgemm: false
             cuda: false
           - name: "Build Windows CPU+CUDA"
-            suffix: cuda10.2
+            suffix: cuda11.2
             fbgemm: false
             cuda: true
 
@@ -147,8 +147,8 @@ jobs:
         # Get the tag name only to use it in the archive name. The variable github.ref can not be used because it starts with refs/tags/
         TAG_NAME=$(echo ${{ github.ref }} | cut -d/ -f3-)
         # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
-        echo "::set-env name=github_tag_name::${TAG_NAME}"
-        echo "::set-env name=archive_name::${{ github.event.repository.name }}-${TAG_NAME}_windows-x64_${{ matrix.suffix }}"
+        echo "github_tag_name=${TAG_NAME}" >> $GITHUB_ENV
+        echo "archive_name=${{ github.event.repository.name }}-${TAG_NAME}_windows-x64_${{ matrix.suffix }}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout
@@ -158,24 +158,24 @@ jobs:
 
     - name: Download MKL
       run: |
-        C:\msys64\usr\bin\wget.exe -nv https://romang.blob.core.windows.net/mariandev/ci/mkl-2020.1-windows-static.zip -O mkl.zip
+        C:\msys64\usr\bin\wget.exe -nv https://data.statmt.org/romang/marian-regression-tests/ci/mkl-2020.1-windows-static.zip -O mkl.zip
         Expand-Archive -Force mkl.zip ${{ github.workspace }}\mkl
         # Set the MKLROOT environment variable so that CMake can find MKL.
         # GITHUB_WORKSPACE is an environment variable available on all GitHub-hosted runners
-        echo "::set-env name=MKLROOT::$env:GITHUB_WORKSPACE/mkl"
-      shell: powershell
+        echo "MKLROOT=$env:GITHUB_WORKSPACE/mkl" | Out-File -FilePath $env:GITHUB_ENV -Append
+      shell: pwsh
 
     - name: Install CUDA
       run: |
         .\scripts\ci\install_cuda_windows.ps1 '${{ env.cuda_version }}'
         # Set path to CUDA for subsequent steps so that CMake can find it
-        echo "::set-env name=CUDA_PATH::$env:CUDA_PATH"
-        echo "::add-path::$env:CUDA_PATH/bin"
-      shell: powershell
+        echo "CUDA_PATH=$env:CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+        echo "$env:CUDA_PATH/bin" | Out-File -FilePath $env:GITHUB_PATH -Append
+      shell: pwsh
       if: matrix.cuda == true
 
     - name: Prepare vcpkg
-      uses: lukka/run-vcpkg@v2
+      uses: lukka/run-vcpkg@v4
       with:
         vcpkgArguments: protobuf
         vcpkgGitCommitId: 6185aa76504a5025f36754324abf307cc776f3da
@@ -184,7 +184,7 @@ jobs:
 
     # Build with a simplified CMake settings JSON file
     - name: Run CMake
-      uses: lukka/run-cmake@v2
+      uses: lukka/run-cmake@v3
       with:
         buildDirectory: ${{ github.workspace }}/build/
         cmakeAppendedArgs: '-G Ninja
@@ -207,14 +207,14 @@ jobs:
       run: |
         cp ../README.md .
         Compress-Archive -Path marian*.exe,README.md -DestinationPath ../${{ env.archive_name }}.zip
-      shell: powershell
+      shell: pwsh
       working-directory: build
 
     # For testing only
     #- name: Test archive
       #run: |
         #Compress-Archive -Path README.md -DestinationPath ${{ env.archive_name }}.zip
-      #shell: powershell
+      #shell: pwsh
 
     - name: Upload archive
       uses: actions/upload-artifact@v2

.github/workflows/ubuntu.yml

@@ -13,51 +13,60 @@ jobs:
         include:
           # Ubuntu CPU-only build
           - name: "Ubuntu CPU-only"
-            os: ubuntu-latest
+            os: ubuntu-20.04
+            cuda: ""
+            gcc: 9
+            clang: ""
+            cpu: true
+            gpu: false
+            unit_tests: true
+            examples: false
+          # Using Clang compiler
+          - name: "Ubuntu CPU-only clang-14"
+            os: ubuntu-22.04
             cuda: ""
-            gcc: 7
+            gcc: ""
+            clang: 14
             cpu: true
             gpu: false
             unit_tests: true
             examples: false
           # Ubuntu GPU-only build
           - name: "Ubuntu GPU-only"
-            os: ubuntu-18.04
-            cuda: "10.2"
-            gcc: 7
+            os: ubuntu-20.04
+            cuda: "11.1"
+            gcc: 9
+            clang: ""
             cpu: false
             gpu: true
             unit_tests: false
             examples: true
-          # Ubuntu 20.04 supports CUDA 11+
+          # Ubuntu 22.04 supports CUDA 11.7
           # Unit tests and examples are not compiled to save disk space
-          - name: "Ubuntu 20.04 CUDA 11.2 gcc-9"
-            os: ubuntu-20.04
-            cuda: "11.2"
-            gcc: 9
+          - name: "Ubuntu 22.04 CUDA 11.7 gcc-11"
+            os: ubuntu-22.04
+            cuda: "11.7"
+            gcc: 11
+            clang: ""
             cpu: false
             gpu: true
             unit_tests: false
             examples: false
-          # Ubuntu 18.04 supports CUDA 10.1+
+          # Ubuntu 20.04 supports CUDA 11+
           # Unit tests and examples are not compiled to save disk space
-          - name: "Ubuntu 18.04 CUDA 10.2 gcc-8"
-            os: ubuntu-18.04
-            cuda: "10.2"
-            gcc: 8
+          - name: "Ubuntu 20.04 CUDA 11.1 gcc-9"
+            os: ubuntu-20.04
+            cuda: "11.1"
+            gcc: 9
+            clang: ""
             cpu: true
             gpu: true
             unit_tests: false
             examples: false
+          # Ubuntu 18.04 supports CUDA 10.1+
+          # But it will soon be removed from GitHub workflows
           # Ubuntu 16.04 supports CUDA 8+
-          - name: "Ubuntu 16.04 CUDA 9.2 gcc-7"
-            os: ubuntu-16.04
-            cuda: "9.2"
-            gcc: 7
-            cpu: true
-            gpu: true
-            unit_tests: true
-            examples: true
+          # But it is no longer available in GitHub workflows
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.name }}
@@ -71,8 +80,13 @@ jobs:
     # The following packages are already installed on GitHub-hosted runners: build-essential openssl libssl-dev
     # No need to install libprotobuf{17,10,9v5} on Ubuntu {20,18,16}.04 because it is installed together with libprotobuf-dev
     # Boost is no longer pre-installed on GitHub-hosted runners
+    # Clang 12, 13 and 14 are pre-installed on the ubuntu-22.04 image
+    # Note that installation of libunwind-dev is a bug fix for ubuntu-22.04 images on Azure/GitHub-hosted machines
+    # and is normally not required
     - name: Install dependencies
-      run: sudo apt-get install -y libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev
+      run: |
+        sudo apt-get install -y libunwind-dev libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev
+        [ -z "${{ matrix.gcc }}" ] || sudo apt-get install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
 
     # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html
     - name: Install MKL
@@ -91,9 +105,10 @@ jobs:
     # https://github.com/actions/virtual-environments/issues/687#issuecomment-610471671
     - name: Configure CMake
       run: |
+        [ -z "${{ matrix.gcc }}" ] || export CC=/usr/bin/gcc-${{ matrix.gcc }} CXX=/usr/bin/g++-${{ matrix.gcc }} CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }}
+        [ -z "${{ matrix.clang }}" ] || export CC=/usr/bin/clang-${{ matrix.clang }} CXX=/usr/bin/clang++-${{ matrix.clang }}
         mkdir -p build
         cd build
-        CC=/usr/bin/gcc-${{ matrix.gcc }} CXX=/usr/bin/g++-${{ matrix.gcc }} CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }} \
         cmake .. \
           -DBoost_ARCHITECTURE=-x64 \
           -DCMAKE_BUILD_TYPE=Release \
@@ -103,6 +118,7 @@ jobs:
           -DCOMPILE_SERVER=on \
           -DCOMPILE_TESTS=${{ matrix.unit_tests }} \
           -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-${{ matrix.cuda }} \
+          -DDETERMINISTIC=on \
           -DUSE_FBGEMM=${{ matrix.cpu }} \
           -DUSE_SENTENCEPIECE=on \
           -DUSE_STATIC_LIBS=on \
@@ -126,4 +142,4 @@ jobs:
         ./marian-scorer --version
         ./marian-server --version
         ./spm_encode --version
-
+        ls -hlv $(find . -maxdepth 1 -type f -executable \( -name "marian*" -o -name "spm*" \))

.github/workflows/windows.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  MKL_URL: "https://romang.blob.core.windows.net/mariandev/ci/mkl-2020.1-windows-static.zip"
+  MKL_URL: "https://data.statmt.org/romang/marian-regression-tests/ci/mkl-2020.1-windows-static.zip"
   BOOST_ROOT: "C:/hostedtoolcache/windows/Boost/1.72.0/x86_64"
   BOOST_URL: "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
 
@@ -81,6 +81,7 @@ jobs:
           -DCOMPILE_CUDA="${{ matrix.gpu }}"
           -DCOMPILE_SERVER="FALSE"
           -DCOMPILE_TESTS="TRUE"
+          -DDETERMINISTIC="TRUE"
           -DUSE_FBGEMM="TRUE"
           -DUSE_MPI="FALSE"
           -DUSE_NCCL="FALSE"
@@ -110,6 +111,7 @@ jobs:
           -DCOMPILE_CUDA="${{ matrix.gpu }}"
           -DCOMPILE_SERVER="FALSE"
           -DCOMPILE_TESTS="TRUE"
+          -DDETERMINISTIC="TRUE"
           -DUSE_FBGEMM="TRUE"
           -DUSE_MPI="FALSE"
           -DUSE_NCCL="FALSE"

.gitignore

@@ -61,5 +61,4 @@ examples/mnist/*ubyte
 /vs/MarianDll.VC.VC.opendb
 
 .vs
-.vscode
-
+.vscode