Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vtk-m: bump vtk-m 2.1.0 #41351

Merged
merged 3 commits into from
Dec 1, 2023
Merged

Conversation

vicentebolea
Copy link
Member

🎉 🎉 🎉

Finally! VTK-m v2.1.0 final release is out.

This bring exiting new features and bugfixes. Find the release notes at https://gitlab.kitware.com/vtk/vtk-m/-/blob/master/docs/changelog/2.1/release-notes.md

Let me know if we need to change anything else in the package

ViB

🎉 🎉 🎉

@vicentebolea
Copy link
Member Author

@spackbot fix style

Copy link

spackbot-app bot commented Nov 30, 2023

Let me see if I can fix that for you!

Copy link

spackbot-app bot commented Nov 30, 2023

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: isort, black, flake8, mypy
==> Modified files
  var/spack/repos/builtin/packages/vtk-m/package.py
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/vtk-m/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
  flake8 checks were clean
==> Running mypy checks
Success: no issues found in 606 source files
  mypy checks were clean
==> spack style checks were clean
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

Copy link
Contributor

@kmorel kmorel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@eugeneswalker
Copy link
Contributor

CI failing here:

  1. vtk-m@2.1.0 /y6ooafr %gcc@11.4.0 arch=linux-ubuntu20.04-x86_64_v3 E4S
...
  >> 147    /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcx
            mz5enjmmsbe/spack-src/vtkm/cont/kokkos/internal/DeviceAdapterAlgori
            thmKokkos.h:47:10: fatal error: 'thrust/device_ptr.h' file not foun
            d
     148    #include <thrust/device_ptr.h>
     149             ^~~~~~~~~~~~~~~~~~~~~
     150    1 error generated when compiling for gfx908.
  >> 151    make[2]: *** [vtkm/cont/CMakeFiles/vtkm_cont.dir/build.make:232: vt
            km/cont/CMakeFiles/vtkm_cont.dir/CellLocatorUniformBins.cxx.o] Erro
            r 1
     152    make[2]: *** Waiting for unfinished jobs....
     153    [  6%] Building CXX object vtkm/cont/CMakeFiles/vtkm_cont.dir/CellS
            et.cxx.o
     154    cd /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifc
            rcxmz5enjmmsbe/spack-build-y6ooafr/vtkm/cont && /builds/spack/spack
            /lib/spack/env/gcc/g++ -DVTKMDIY_MPI_AS_LIB -DVTKMDIY_NO_THREADS -D
            vtkm_cont_EXPORTS -I/tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y
            6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-src/vtkm/thirdparty/optionpar
            ser -I/tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kew
            ifcrcxmz5enjmmsbe/spack-src/vtkm/thirdparty/diy -I/tmp/root/spack-s
            tage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack
            -src/vtkm/thirdparty/lcl/vtkmlcl -I/tmp/root/spack-stage/spack-stag
            e-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-src -I/tmp/roo
            t/spack-stage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmm
            sbe/spack-build-y6ooafr/include -isystem /tmp/root/spack-stage/spac
            k-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-src/vtkm
            /thirdparty/diy/vtkmdiy/include -isystem /tmp/root/spack-stage/spac
            k-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-build-y6
            ooafr/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi -isystem /hom
            e/software/spack/__spack_path_placeholder__/__spack_path_placeholde
            r__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_p
            ath_placeholder__/__spack_path_placeholder__/__spack_path_placehold
            er__/__spack_path_placeholder__/__spack_path_placeh/linux-ubuntu20.
            04-x86_64_v3/gcc-11.4.0/kokkos-3.7.01-3is7m42nmmptmyp5onrxq2lkzjnqw
            jb3/include -O3 -DNDEBUG -std=c++17 -fPIC -fvisibility=hidden -Wall
             -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -W
            shadow -Wunused -fno-common -Wno-unused-function -Wchar-subscripts 
            -Wfloat-conversion -Wodr -ffunction-sections -pthread -MD -MT vtkm/
            cont/CMakeFiles/vtkm_cont.dir/CellSet.cxx.o -MF CMakeFiles/vtkm_con
            t.dir/CellSet.cxx.o.d -o CMakeFiles/vtkm_cont.dir/CellSet.cxx.o -c 
            /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y6ooafrkb6f4kewifcrcx
            mz5enjmmsbe/spack-src/vtkm/cont/CellSet.cxx
     155    make[2]: Leaving directory '/tmp/root/spack-stage/spack-stage-vtk-m
            -2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-build-y6ooafr'
  >> 156    make[1]: *** [CMakeFiles/Makefile2:2820: vtkm/cont/CMakeFiles/vtkm_
            cont.dir/all] Error 2
     157    make[1]: Leaving directory '/tmp/root/spack-stage/spack-stage-vtk-m
            -2.1.0-y6ooafrkb6f4kewifcrcxmz5enjmmsbe/spack-build-y6ooafr'
  >> 158    make: *** [Makefile:159: all] Error 2
  1. vtk-m@2.1.0 /ybtwkbe %gcc@11.4.0 arch=linux-ubuntu20.04-x86_64_v3 E4S
...
  >> 147    /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc
            6jozvbnrfda/spack-src/vtkm/cont/kokkos/internal/DeviceAdapterAlgori
            thmKokkos.h:47:10: fatal error: 'thrust/device_ptr.h' file not foun
            d
     148    #include <thrust/device_ptr.h>
     149             ^~~~~~~~~~~~~~~~~~~~~
     150    1 error generated when compiling for gfx90a.
  >> 151    make[2]: *** [vtkm/cont/CMakeFiles/vtkm_cont.dir/build.make:232: vt
            km/cont/CMakeFiles/vtkm_cont.dir/CellLocatorUniformBins.cxx.o] Erro
            r 1
     152    make[2]: *** Waiting for unfinished jobs....
     153    [  6%] Building CXX object vtkm/cont/CMakeFiles/vtkm_cont.dir/CellS
            et.cxx.o
     154    cd /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4b
            vuc6jozvbnrfda/spack-build-ybtwkbe/vtkm/cont && /builds/spack/spack
            /lib/spack/env/gcc/g++ -DVTKMDIY_MPI_AS_LIB -DVTKMDIY_NO_THREADS -D
            vtkm_cont_EXPORTS -I/tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-y
            btwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-src/vtkm/thirdparty/optionpar
            ser -I/tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ff
            r4bvuc6jozvbnrfda/spack-src/vtkm/thirdparty/diy -I/tmp/root/spack-s
            tage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack
            -src/vtkm/thirdparty/lcl/vtkmlcl -I/tmp/root/spack-stage/spack-stag
            e-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-src -I/tmp/roo
            t/spack-stage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnr
            fda/spack-build-ybtwkbe/include -isystem /tmp/root/spack-stage/spac
            k-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-src/vtkm
            /thirdparty/diy/vtkmdiy/include -isystem /tmp/root/spack-stage/spac
            k-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-build-yb
            twkbe/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi -isystem /hom
            e/software/spack/__spack_path_placeholder__/__spack_path_placeholde
            r__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_p
            ath_placeholder__/__spack_path_placeholder__/__spack_path_placehold
            er__/__spack_path_placeholder__/__spack_path_placeh/linux-ubuntu20.
            04-x86_64_v3/gcc-11.4.0/kokkos-3.7.01-zuovofah5eeosjceg6e7ktvc457fk
            z72/include -O3 -DNDEBUG -std=c++17 -fPIC -fvisibility=hidden -Wall
             -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -W
            shadow -Wunused -fno-common -Wno-unused-function -Wchar-subscripts 
            -Wfloat-conversion -Wodr -ffunction-sections -pthread -MD -MT vtkm/
            cont/CMakeFiles/vtkm_cont.dir/CellSet.cxx.o -MF CMakeFiles/vtkm_con
            t.dir/CellSet.cxx.o.d -o CMakeFiles/vtkm_cont.dir/CellSet.cxx.o -c 
            /tmp/root/spack-stage/spack-stage-vtk-m-2.1.0-ybtwkbeqyjwg4ffr4bvuc
            6jozvbnrfda/spack-src/vtkm/cont/CellSet.cxx
     155    make[2]: Leaving directory '/tmp/root/spack-stage/spack-stage-vtk-m
            -2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-build-ybtwkbe'
  >> 156    make[1]: *** [CMakeFiles/Makefile2:2820: vtkm/cont/CMakeFiles/vtkm_
            cont.dir/all] Error 2
     157    make[1]: Leaving directory '/tmp/root/spack-stage/spack-stage-vtk-m
            -2.1.0-ybtwkbeqyjwg4ffr4bvuc6jozvbnrfda/spack-build-ybtwkbe'
  >> 158    make: *** [Makefile:159: all] Error 2

tldahlgren
tldahlgren previously approved these changes Nov 30, 2023
Copy link
Contributor

@tldahlgren tldahlgren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed the version sha256, rest LGTM.

@vicentebolea
Copy link
Member Author

vicentebolea commented Dec 1, 2023

Gitlab CI error is fixed and we have already merged in upstream the fix.

@eugeneswalker
Copy link
Contributor

Should we wait for more review or proceed w merge now?

@vicentebolea
Copy link
Member Author

vicentebolea commented Dec 1, 2023 via email

@eugeneswalker eugeneswalker merged commit 17c87b4 into spack:develop Dec 1, 2023
13 checks passed
@vicentebolea vicentebolea deleted the update-vtkm branch December 1, 2023 18:07
RikkiButler20 pushed a commit to RikkiButler20/spack that referenced this pull request Jan 31, 2024
* vtk-m: bump vtk-m 2.1.0

* Update package.py

* Update package.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants