Fixed cache_exclude scripts to reduce the cache size

Author: mmzakhar

.azure-pipelines.yml

@@ -55,7 +55,7 @@ jobs:
     condition: ne(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_windows.bat c++ - $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_windows.sh
+  - bash: scripts/cache_exclude_windows.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
 
@@ -89,7 +89,7 @@ jobs:
     condition: ne(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_windows.bat fortran - $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_windows.sh
+  - bash: scripts/cache_exclude_windows.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
 
@@ -134,7 +134,7 @@ jobs:
     condition: eq(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_windows.bat dpc++ - $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_windows.sh
+  - bash: scripts/cache_exclude_windows.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
   - bash: |
@@ -177,7 +177,7 @@ jobs:
     condition: ne(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_linux.sh c++ $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_linux.sh
+  - bash: scripts/cache_exclude_linux.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
 
@@ -199,7 +199,7 @@ jobs:
     condition: ne(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_linux.sh fortran $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_linux.sh
+  - bash: scripts/cache_exclude_linux.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
 
@@ -225,7 +225,7 @@ jobs:
     condition: ne(variables.CACHE_RESTORED, 'true')
   - script: scripts/build_linux.sh dpc++ $(ONEAPI_RELEASE)
     displayName: build
-  - bash: scripts/cache_exclude_linux.sh
+  - bash: scripts/cache_exclude_linux.sh $(ONEAPI_RELEASE)
     displayName: exclude unused files from cache
     condition: ne(variables.CACHE_RESTORED, 'true')
 

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
           command: scripts/build_windows.bat c++ 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: scripts/cache_exclude_windows.sh
+          command: scripts/cache_exclude_windows.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_CPP_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
           paths:
@@ -98,7 +98,7 @@ jobs:
           command: scripts/build_windows.bat fortran 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: scripts/cache_exclude_windows.sh
+          command: scripts/cache_exclude_windows.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
           paths:
@@ -132,7 +132,7 @@ jobs:
           command: scripts/build_windows.bat dpc++ 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: scripts/cache_exclude_windows.sh
+          command: scripts/cache_exclude_windows.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.WINDOWS_BASEKIT_URL >>-<< pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>-compiler-tbb-opencl-{{ checksum "scripts/cache_exclude_windows.sh" }}
           paths:
@@ -176,7 +176,7 @@ jobs:
           command: scripts/build_linux.sh c++ << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: . scripts/cache_exclude_linux_no_sudo.sh
+          command: . scripts/cache_exclude_linux_no_sudo.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.LINUX_CPP_COMPONENTS >>-{{ checksum "depends.txt" }}-compiler-${{ checksum "scripts/cache_exclude_linux_no_sudo.sh" }}
           paths:
@@ -209,7 +209,7 @@ jobs:
           command: scripts/build_linux.sh fortran << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: . scripts/cache_exclude_linux_no_sudo.sh
+          command: . scripts/cache_exclude_linux_no_sudo.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.LINUX_FORTRAN_COMPONENTS >>-{{ checksum "depends.txt" }}-compiler-${{ checksum "scripts/cache_exclude_linux_no_sudo.sh" }}
           paths:
@@ -242,7 +242,7 @@ jobs:
           command: scripts/build_linux.sh dpc++ << pipeline.parameters.ONEAPI_RELEASE >>
       - run:
           name: exclude unused files from cache
-          command: . scripts/cache_exclude_linux_no_sudo.sh
+          command: . scripts/cache_exclude_linux_no_sudo.sh << pipeline.parameters.ONEAPI_RELEASE >>
       - save_cache:
           key: install-<< pipeline.parameters.LINUX_DPCPP_COMPONENTS >>-{{ checksum "depends.txt" }}-compiler-${{ checksum "scripts/cache_exclude_linux_no_sudo.sh" }}
           paths:

.github/workflows/build_all.yml

@@ -43,7 +43,7 @@ jobs:
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
       shell: bash
-      run: scripts/cache_exclude_windows.sh
+      run: scripts/cache_exclude_windows.sh $ONEAPI_RELEASE
 
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
@@ -78,7 +78,7 @@ jobs:
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
       shell: bash
-      run: scripts/cache_exclude_windows.sh
+      run: scripts/cache_exclude_windows.sh $ONEAPI_RELEASE
 
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
@@ -116,7 +116,7 @@ jobs:
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
       shell: bash
-      run: scripts/cache_exclude_windows.sh
+      run: scripts/cache_exclude_windows.sh $ONEAPI_RELEASE
 
     # Delete the following if you don't want to save install logs
     - name: Saving install logs
@@ -155,7 +155,7 @@ jobs:
       run: scripts/build_linux.sh c++ $ONEAPI_RELEASE
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
-      run: scripts/cache_exclude_linux.sh
+      run: scripts/cache_exclude_linux.sh $ONEAPI_RELEASE
 
   build_linux_apt_fortran:
     runs-on: ubuntu-20.04
@@ -182,7 +182,7 @@ jobs:
       run: scripts/build_linux.sh fortran $ONEAPI_RELEASE
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
-      run: scripts/cache_exclude_linux.sh
+      run: scripts/cache_exclude_linux.sh $ONEAPI_RELEASE
 
   build_linux_apt_dpcpp:
     runs-on: ubuntu-20.04
@@ -210,7 +210,7 @@ jobs:
       run: scripts/build_linux.sh dpc++ $ONEAPI_RELEASE
     - name: exclude unused files from cache
       if: steps.cache-install.outputs.cache-hit != 'true'
-      run: scripts/cache_exclude_linux.sh
+      run: scripts/cache_exclude_linux.sh $ONEAPI_RELEASE
 
   build_linux_container_cpp:
     runs-on: ubuntu-20.04

.gitlab-ci.yml

@@ -49,7 +49,7 @@ build_windows_cpp:
   after_script:  # Moving install directory into 'cache' folder inside build directory
     - |
         if(!(Test-Path cache)) {
-          scripts/cache_exclude_windows.ps1
+          scripts/cache_exclude_windows.ps1 $ONEAPI_RELEASE
           New-Item -ItemType "directory" -Path "cache"
         }
         # "push-pull" is the default cache policy, so cache folder needs to be setup in every run.
@@ -89,7 +89,7 @@ build_windows_fortran:
   after_script:
     - |
         if(!(Test-Path cache)) {
-          scripts/cache_exclude_windows.ps1
+          scripts/cache_exclude_windows.ps1 $ONEAPI_RELEASE
           New-Item -ItemType "directory" -Path "cache"
         }
         Move-Item -Path "C:\Program Files (x86)\Intel\oneAPI\compiler" -Destination "cache"
@@ -129,7 +129,7 @@ build_windows_dpcpp:
   after_script:
     - |
         if(!(Test-Path cache)) {
-          scripts/cache_exclude_windows.ps1
+          scripts/cache_exclude_windows.ps1 $ONEAPI_RELEASE
           New-Item -ItemType "directory" -Path "cache"
         }
         Move-Item -Path "C:\Program Files (x86)\Intel\oneAPI\compiler" -Destination "cache"
@@ -171,7 +171,7 @@ build_linux_apt_cpp:
     - |
         if [[ ! -d cache ]]
         then
-          . scripts/cache_exclude_linux_no_sudo.sh
+          . scripts/cache_exclude_linux_no_sudo.sh ${ONEAPI_RELEASE}
           mkdir cache
         fi
         mv /opt/intel/oneapi/compiler cache
@@ -203,7 +203,7 @@ build_linux_apt_fortran:
     - |
         if [[ ! -d cache ]]
         then
-          . scripts/cache_exclude_linux_no_sudo.sh
+          . scripts/cache_exclude_linux_no_sudo.sh ${ONEAPI_RELEASE}
           mkdir cache
         fi
         mv /opt/intel/oneapi/compiler cache
@@ -236,7 +236,7 @@ build_linux_apt_dpcpp:
     - |
         if [[ ! -d cache ]]
         then
-          . scripts/cache_exclude_linux_no_sudo.sh
+          . scripts/cache_exclude_linux_no_sudo.sh ${ONEAPI_RELEASE}
           mkdir cache
         fi
         mv /opt/intel/oneapi/compiler cache

scripts/cache_exclude_linux.sh

@@ -4,7 +4,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-sudo rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/compiler/lib/ia32_lin
-sudo rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/bin/ia32
-sudo rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/lib/emu
-sudo rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/lib/oclfpga
+ONEAPI_RELEASE=$1
+
+sudo rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/compiler/lib/ia32_lin
+sudo rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/bin/ia32
+sudo rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/lib/emu
+sudo rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/lib/oclfpga

scripts/cache_exclude_linux_no_sudo.sh

@@ -4,7 +4,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/compiler/lib/ia32_lin
-rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/bin/ia32
-rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/lib/emu
-rm -rf /opt/intel/oneapi/compiler/2021.1-beta10/linux/lib/oclfpga
+ONEAPI_RELEASE=$1
+
+rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/compiler/lib/ia32_lin
+rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/bin/ia32
+rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/lib/emu
+rm -rf /opt/intel/oneapi/compiler/"$ONEAPI_RELEASE"/linux/lib/oclfpga

scripts/cache_exclude_windows.ps1

@@ -2,11 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\compiler\lib\ia32_win" -Force  -Recurse -ErrorAction SilentlyContinue
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\bin\intel64_ia32" -Force  -Recurse -ErrorAction SilentlyContinue
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\emu" -Force  -Recurse -ErrorAction SilentlyContinue
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\oclfpga" -Force  -Recurse -ErrorAction SilentlyContinue
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\ocloc" -Force  -Recurse -ErrorAction SilentlyContinue
-Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\x86" -Force  -Recurse -ErrorAction SilentlyContinue
+$ONEAPI_RELEASE=$args[0]
+
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\compiler\lib\ia32_win" -Force  -Recurse -ErrorAction SilentlyContinue
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\bin\intel64_ia32" -Force  -Recurse -ErrorAction SilentlyContinue
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\lib\emu" -Force  -Recurse -ErrorAction SilentlyContinue
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\lib\oclfpga" -Force  -Recurse -ErrorAction SilentlyContinue
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\lib\ocloc" -Force  -Recurse -ErrorAction SilentlyContinue
+Remove-Item "C:\Program Files (x86)\Intel\oneAPI\compiler\$ONEAPI_RELEASE\windows\lib\x86" -Force  -Recurse -ErrorAction SilentlyContinue
 
 exit 0

scripts/cache_exclude_windows.sh

@@ -4,9 +4,11 @@
 #
 # SPDX-License-Identifier: MIT
 
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\compiler\lib\ia32_win"
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\bin\intel64_ia32"
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\emu"
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\oclfpga"
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\ocloc"
-rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\2021.1-beta10\windows\lib\x86"
+ONEAPI_RELEASE=$1
+
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\compiler\lib\ia32_win"
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\bin\intel64_ia32"
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\lib\emu"
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\lib\oclfpga"
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\lib\ocloc"
+rm -rf "C:\Program Files (x86)\Intel\oneAPI\compiler\'$ONEAPI_RELEASE'\windows\lib\x86"