From 8b55983950f29f4e2f99ec0d08216deab0aa7185 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Tue, 8 Apr 2025 16:35:29 -0500 Subject: [PATCH] Revert "OneAPI test." This reverts commit eb7685def9ff3faf90971a38bf95c78656afb94b. --- .github/workflows/daily-build.yml | 60 ------------- .github/workflows/oneapi-par.yml | 143 ------------------------------ 2 files changed, 203 deletions(-) delete mode 100644 .github/workflows/oneapi-par.yml diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 4c57836c8f8..214dc0cf716 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -1,12 +1,3 @@ -<<<<<<< HEAD -name: hdf5 dev daily build - -# Triggers the workflow on a schedule or on demand -on: - workflow_dispatch: - schedule: - - cron: "6 0 * * *" -======= name: hdf5 1.14 daily build # Triggers the workflow on demand or on a call from another workflow @@ -26,7 +17,6 @@ on: type: string required: false default: check ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea permissions: contents: read @@ -36,10 +26,7 @@ jobs: runs-on: ubuntu-latest outputs: hdf5-name: ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }} -<<<<<<< HEAD -======= run-ignore: ${{ steps.getinputs.outputs.INPUTS_IGNORE }} ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea steps: - uses: actions/checkout@v4.1.7 @@ -47,14 +34,9 @@ jobs: - name: Get hdf5 release base name uses: dsaltares/fetch-gh-release-asset@master with: -<<<<<<< HEAD - version: 'tags/snapshot' - file: 'last-file.txt' -======= version: 'tags/snapshot-1.14' file: 'last-file.txt' continue-on-error: true ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea - name: Read base-name file id: gethdf5base @@ -62,16 +44,6 @@ jobs: - run: echo "hdf5 base name is ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}." -<<<<<<< HEAD - call-workflow-tarball: - uses: ./.github/workflows/tarball.yml - with: - use_tag: snapshot - use_environ: snapshots - - call-workflow-ctest: - needs: call-workflow-tarball -======= - name: Read inputs id: getinputs run: | @@ -132,53 +104,33 @@ jobs: call-workflow-ctest: needs: [get-old-names, call-workflow-tarball] ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea uses: ./.github/workflows/cmake-ctest.yml with: preset_name: ci-StdShar file_base: ${{ needs.call-workflow-tarball.outputs.file_base }} -<<<<<<< HEAD -# use_tag: snapshot - use_environ: snapshots - secrets: -======= #use_tag: snapshot-1.14 use_environ: snapshots secrets: APPLE_CERTS_BASE64: ${{ secrets.APPLE_CERTS_BASE64 }} APPLE_CERTS_BASE64_PASSWD: ${{ secrets.APPLE_CERTS_BASE64_PASSWD }} KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }} ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }} AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }} AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }} -<<<<<<< HEAD - if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }} - - call-workflow-abi: - needs: [call-workflow-tarball, call-workflow-ctest] -======= if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }} call-workflow-abi: needs: [get-old-names, call-workflow-tarball, call-workflow-ctest] ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea uses: ./.github/workflows/abi-report.yml with: file_ref: '1.14.4.3' file_base: ${{ needs.call-workflow-tarball.outputs.file_base }} -<<<<<<< HEAD - use_tag: snapshot - use_environ: snapshots - if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }} -======= use_tag: snapshot-1.14 use_environ: snapshots if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }} ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea call-workflow-release: needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi] @@ -189,15 +141,9 @@ jobs: file_base: ${{ needs.call-workflow-tarball.outputs.file_base }} file_branch: ${{ needs.call-workflow-tarball.outputs.file_branch }} file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }} -<<<<<<< HEAD - use_tag: snapshot - use_environ: snapshots - if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }} -======= use_tag: snapshot-1.14 use_environ: snapshots if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }} ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea call-workflow-remove: needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi, call-workflow-release] @@ -206,13 +152,7 @@ jobs: uses: ./.github/workflows/remove-files.yml with: file_base: ${{ needs.get-old-names.outputs.hdf5-name }} -<<<<<<< HEAD - use_tag: snapshot - use_environ: snapshots - if: ${{ (needs.call-workflow-tarball.outputs.has_changes == 'true') && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }} -======= use_tag: snapshot-1.14 use_environ: snapshots if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }} ->>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea diff --git a/.github/workflows/oneapi-par.yml b/.github/workflows/oneapi-par.yml deleted file mode 100644 index f758e705802..00000000000 --- a/.github/workflows/oneapi-par.yml +++ /dev/null @@ -1,143 +0,0 @@ -name: hdf5 callable parallel report to cdash - -# Triggers hdf5 1.14 parallel ctest script the workflow on a call from another workflow -on: - workflow_call: - inputs: - snap_name: - description: 'The name in the source tarballs' - type: string - required: false - default: hdfsrc - file_base: - description: "The common base name of the source tarballs" - required: true - type: string - use_environ: - description: 'Environment to locate files' - type: string - required: true - default: snapshots - build_mode: - description: "release vs. debug build" - required: true - type: string - -permissions: - contents: read - -jobs: - CMake_build_parallel_linux: - runs-on: ubuntu-latest - strategy: - matrix: - mpi: ['intelmpi'] - name: "Parallel ${{ matrix.mpi }} Linux-${{ inputs.build_mode }}" - steps: - - name: Install CMake Dependencies (${{ matrix.mpi }}) - run: | - sudo apt-get update - sudo apt-get install ninja-build graphviz curl - sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev - sudo apt install libaec0 libaec-dev - - - name: Install oneAPI (Linux) - uses: fortran-lang/setup-fortran@v1 - id: setup-fortran - with: - compiler: intel - version: '2024.1' - - - name: Install Dependencies - uses: ssciwr/doxygen-install@v1 - with: - version: "1.13.2" - - - name: Set MPI Environment Variables (${{ matrix.mpi }}) - run: | - echo "CC=mpiicx" >> $GITHUB_ENV - echo "FC=mpiifx" >> $GITHUB_ENV - - - name: Set file base name (${{ matrix.mpi }}) - id: set-file-base - run: | - FILE_NAME_BASE=$(echo "${{ inputs.file_base }}") - echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT - if [[ '${{ inputs.use_environ }}' == 'release' ]] - then - SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}") - else - SOURCE_NAME_BASE=$(echo "hdfsrc") - fi - echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT - shell: bash - - # Get files created by release script - - name: Get tgz-tarball (${{ matrix.mpi }}) - uses: actions/download-artifact@v4.2.1 - with: - name: tgz-tarball - path: ${{ github.workspace }} - - - name: List files for the space (Linux) - run: | - ls -l ${{ github.workspace }} - ls ${{ runner.workspace }} - - - name: Uncompress source (Linux) - run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz - - - name: Copy script files for the space (${{ matrix.mpi }}) - run: | - cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5 - cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5 - - - name: List files for the hdf5 (${{ matrix.mpi }}) - run: | - ls ${{ runner.workspace }}/hdf5 - - - name: Create options file (${{ matrix.mpi }}) - uses: "DamianReeves/write-file-action@master" - with: - path: ${{ runner.workspace }}/hdf5/HDF5options.cmake - write-mode: overwrite - contents: | - set (CTEST_DROP_SITE_INIT "my.cdash.org") - # Change following line to submit to your CDash dashboard to a different CDash project - #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5") - set (SITE_BUILDNAME_SUFFIX "${{ steps.set-file-base.outputs.FILE_BASE }}") - set (ctest_test_args INCLUDE MPI_TEST) - set (CTEST_TEST_TIMEOUT 600 CACHE STRING "Maximum test time allowed.") - set (MODEL "MPI") - set (GROUP "MPI") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }}") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=2") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF") - - - name: Run ctest script (${{ matrix.mpi }}) - run: | - cd "${{ runner.workspace }}/hdf5" - ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-${{ github.event.repository.full_name }}-${{ matrix.mpi }},LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C ${{ inputs.build_mode }} -VV -O hdf5.log - shell: bash - continue-on-error: true - - # Save log files created by ctest script - - name: Save log (${{ matrix.mpi }}) - uses: actions/upload-artifact@v4 - with: - name: linux-${{ matrix.mpi }}-log - path: ${{ runner.workspace }}/hdf5/hdf5.log -