diff --git a/.appveyor.yml b/.appveyor.yml
index e06e7c55..c48b0f89 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,10 +4,10 @@
 
 environment:
   global:
-    WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe
-    WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe
-    LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100_offline.sh
-    LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79_offline.sh
+    WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe
+    WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe
+    LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885_offline.sh
+    LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825_offline.sh
     WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
     WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
     WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
@@ -17,7 +17,7 @@ environment:
     LINUX_CPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
     LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
     LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
-    SAMPLES_TAG: 2024.2.0
+    SAMPLES_TAG: 2025.0.0
     VS_VER: vs2019
 
   matrix:
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 41c6ab64..78c9c797 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -7,13 +7,13 @@ trigger:
 
 variables:
   - name: WINDOWS_BASEKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe
+    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe
   - name: WINDOWS_HPCKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe
+    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe
   - name: LINUX_BASEKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100_offline.sh
+    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885_offline.sh
   - name: LINUX_HPCKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79_offline.sh
+    value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825_offline.sh
   - name: WINDOWS_CPP_COMPONENTS
     value: intel.oneapi.win.cpp-dpcpp-common
   - name: WINDOWS_FORTRAN_COMPONENTS
@@ -33,11 +33,11 @@ variables:
   - name: LINUX_DPCPP_COMPONENTS_WEB
     value: intel.oneapi.lin.dpcpp-cpp-compiler
   - name: SAMPLES_TAG
-    value: 2024.2.0
+    value: 2025.0.0
   - name: COMPILER_VERSION
-    value: 2024.2.1
+    value: 2025.0.0
   - name: TBB_VERSION
-    value: 2021.13.1
+    value: 2022.0.0
   - name: VS_VER
     value: vs2022
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ee0abbc..075c956c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,16 +6,16 @@ version: 2.1
 parameters:
   WINDOWS_BASEKIT_URL:
     type: string
-    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe"
+    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe"
   WINDOWS_HPCKIT_URL:
     type: string
-    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe"
+    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe"
   LINUX_BASEKIT_URL:
     type: string
-    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100_offline.sh"
+    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885_offline.sh"
   LINUX_HPCKIT_URL:
     type: string
-    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79_offline.sh"
+    default: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825_offline.sh"
   WINDOWS_CPP_COMPONENTS:
     type: string
     default: "intel.oneapi.win.cpp-dpcpp-common"
@@ -45,13 +45,13 @@ parameters:
     default: "intel.oneapi.lin.dpcpp-cpp-compiler"
   SAMPLES_TAG:
     type: string
-    default: "2024.2.0"
+    default: "2025.0.0"
   COMPILER_VERSION:
     type: string
-    default: "2024.2.1"
+    default: "2025.0.0"
   TBB_VERSION:
     type: string
-    default: "2021.13.1"
+    default: "2022.0.0"
   VS_VER:
     type: string
     default: "vs2017"
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index 79cc3b3f..db0891c5 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -8,10 +8,10 @@ permissions: read-all
 on: push
 
 env:
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe
-  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100_offline.sh
-  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79_offline.sh
+  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe
+  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885_offline.sh
+  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825_offline.sh
   LINUX_AIKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0414ef18-5b64-47f2-9b2e-ae94860272b9/l_AITools.2024.1.0.9.sh
   WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
   WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
@@ -22,11 +22,11 @@ env:
   LINUX_CPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
   LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
   LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
-  CACHE_NUMBER: 6
-  SAMPLES_TAG: 2024.2.0
+  CACHE_NUMBER: 8
+  SAMPLES_TAG: 2025.0.0
   AI_SAMPLES_TAG: 2024.1.0
-  COMPILER_VERSION: 2024.2.1
-  TBB_VERSION: 2021.13.1
+  COMPILER_VERSION: 2025.0.0
+  TBB_VERSION: 2022.0.0
   VS_VER: vs2022
 
 jobs:
@@ -58,7 +58,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -95,7 +95,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -137,7 +137,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -172,7 +172,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -206,7 +206,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -241,7 +241,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
@@ -264,7 +264,7 @@ jobs:
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
       if: steps.cache-install.outputs.cache-hit != 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: InstallLogs_${{ github.job }}
         path: |
diff --git a/.github/workflows/list_components.yml b/.github/workflows/list_components.yml
index c378aa11..f55e279a 100644
--- a/.github/workflows/list_components.yml
+++ b/.github/workflows/list_components.yml
@@ -12,10 +12,10 @@ on:
     - cron: '0 0 * * *'
 
 env:
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101.exe
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80.exe
-  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100.sh
-  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79.sh
+  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882.exe
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822.exe
+  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885.sh
+  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825.sh
   LINUX_AIKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0414ef18-5b64-47f2-9b2e-ae94860272b9/l_AITools.2024.1.0.9.sh
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
       run: scripts/list_components_windows.bat $WINDOWS_HPCKIT_URL doc\\source\\${{ github.workflow }}\\${{ github.job }}_hpckit.txt
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.job }}
         path: doc/source/${{ github.workflow }}/${{ github.job }}_*
@@ -55,7 +55,7 @@ jobs:
     - name: Intel® oneAPI HPC Toolkit
       run: scripts/list_components_linux.sh $LINUX_HPCKIT_URL doc/source/${{ github.workflow }}/${{ github.job }}_hpckit.txt
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.job }}
         path: doc/source/${{ github.workflow }}/${{ github.job }}_*
@@ -73,7 +73,7 @@ jobs:
     - name: Intel® AI Tools Toolkit
       run: scripts/list_components_linux_aitools.sh $LINUX_AIKIT_URL doc/source/${{ github.workflow }}/${{ github.job }}.txt
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.job }}
         path: doc/source/${{ github.workflow }}/${{ github.job }}*
@@ -94,7 +94,7 @@ jobs:
       run: scripts/list_components_linux_apt.sh doc/source/${{ github.workflow }}/${{ github.job }}.txt
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.job }}
         path: doc/source/${{ github.workflow }}/${{ github.job }}.txt
@@ -116,7 +116,7 @@ jobs:
       run: scripts/list_components_linux_dnf.sh doc/source/${{ github.workflow }}/${{ github.job }}.txt
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.job }}
         path: doc/source/${{ github.workflow }}/${{ github.job }}.txt
@@ -135,27 +135,27 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Download artifacts - windows
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: windows
         path: doc/source/${{ github.workflow }}
     - name: Download artifacts - linux
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: linux
         path: doc/source/${{ github.workflow }}
     - name: Download artifacts - linux_apt
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: linux_apt
         path: doc/source/${{ github.workflow }}
     - name: Download artifacts - linux_yum_dnf
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: linux_yum_dnf
         path: doc/source/${{ github.workflow }}
     - name: Download artifacts - linux_aitools
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: linux_aitools
         path: doc/source/${{ github.workflow }}
@@ -171,7 +171,7 @@ jobs:
         sed -i -e 1,7d source/${{ github.workflow }}/linux_yum_dnf.txt
         make html
     - name: Save built doc as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
           name: ${{ github.job }}
           path: doc/build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41f70d3a..2b19c6f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,10 @@ stages:
   - build
 
 variables:
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe
-  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e6ff8e9c-ee28-47fb-abd7-5c524c983e1c/l_BaseKit_p_2024.2.1.100_offline.sh
-  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d461a695-6481-426f-a22f-b5644cd1fa8b/l_HPCKit_p_2024.2.1.79_offline.sh
+  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe
+  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/96aa5993-5b22-4a9b-91ab-da679f422594/intel-oneapi-base-toolkit-2025.0.0.885_offline.sh
+  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0884ef13-20f3-41d3-baa2-362fc31de8eb/intel-oneapi-hpc-toolkit-2025.0.0.825_offline.sh
   WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
   WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
   WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
@@ -19,10 +19,10 @@ variables:
   LINUX_CPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler-pro
   LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
   LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
-  CACHE_NUMBER: 7
-  SAMPLES_TAG: 2024.2.0
-  COMPILER_VERSION: "2024.2.1"
-  TBB_VERSION: "2021.13.1"
+  CACHE_NUMBER: 8
+  SAMPLES_TAG: 2025.0.0
+  COMPILER_VERSION: "2025.0.0"
+  TBB_VERSION: "2022.0.0"
   VS_VER: 2019_build_tools
 
 .shared_windows_runners:
diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh
index 9eb1d29b..f1a78d3e 100755
--- a/scripts/build_linux.sh
+++ b/scripts/build_linux.sh
@@ -28,8 +28,7 @@ dpc++)
   LATEST_VERSION=$(ls -1 /opt/intel/oneapi/tbb/ | grep -v latest | sort | tail -1)
 # shellcheck source=/dev/null
   source /opt/intel/oneapi/tbb/"$LATEST_VERSION"/env/vars.sh
-  cd oneAPI-samples/DirectProgramming/C++SYCL/DenseLinearAlgebra/vector-add
-  export SYCL_DEVICE_TYPE=CPU
-  mkdir build && cd build && cmake .. && make cpu-gpu && ./vector-add-buffers
+  cd oneAPI-samples/DirectProgramming/C++SYCL/DenseLinearAlgebra/simple-add
+  mkdir build && cd build && cmake .. && make cpu-gpu && ./simple-add-buffers
   ;;
 esac
diff --git a/scripts/build_windows.bat b/scripts/build_windows.bat
index d70b904f..3691530f 100644
--- a/scripts/build_windows.bat
+++ b/scripts/build_windows.bat
@@ -38,7 +38,7 @@ goto exit
 
 :fortran
 cd oneAPI-samples\DirectProgramming\Fortran\CombinationalLogic\openmp-primes
-ifort -O2 -fpp /Qopenmp src\openmp_sample.f90
+ifx -O2 -fpp /Qopenmp src\openmp_sample.f90
 openmp_sample.exe
 set RESULT=%ERRORLEVEL%
 ifx -O2 -fpp /Qopenmp src\openmp_sample.f90