update against viskores 1.2.0-rc2

[nicolemarsaglia]

I believe there will be a 1.2.0-rc2 that will include all of our patches in the build script.

[cyrush]

@nicolemarsaglia

Looks l like there is an issue applying patches with build_ascent:

 **** Downloading /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0

100 5118k  100 5118k    0     0  6302k      0 --:--:-- --:--:-- --:--:-- 6302k
**** Extracting /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
**** Applying Patches to /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
patching file viskores/rendering/CanvasRayTracer.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file viskores/rendering/CanvasRayTracer.cxx.rej
patching file viskores/rendering/MapperVolume.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file viskores/rendering/MapperVolume.cxx.rej

[cyrush]

Not related to your changes -- but I also noticed that the viskores tarball file is truncated to basically just the version number.

ascent/scripts/build_ascent/build_ascent.sh

Line 677 in 3964b26

viskores_tarball=$(ospath ${source_dir}/v${viskores_version}.tar.gz)

Should we a prefix viskores- ?

[nicolemarsaglia]

@nicolemarsaglia

Looks l like there is an issue applying patches with build_ascent:

 **** Downloading /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0

100 5118k  100 5118k    0     0  6302k      0 --:--:-- --:--:-- --:--:-- 6302k
**** Extracting /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
**** Applying Patches to /home/runner/work/ascent/ascent/source/v1.2.0-rc1.tar.gz
patching file viskores/rendering/CanvasRayTracer.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file viskores/rendering/CanvasRayTracer.cxx.rej
patching file viskores/rendering/MapperVolume.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file viskores/rendering/MapperVolume.cxx.rej

Oops! We shouldn't need any patches when we update to 1.2.0, so that's nice. I'll update the build script

[cyrush]

the windows errors look like images diffs above threshold, I can build on windows and take a look

[nicolemarsaglia]

the windows errors look like images diffs above threshold, I can build on windows and take a look

That's annoying. I can tell the render_2d_mixed png is back to old output, something that was fixed by a patch that should now be in viskores. le sigh

[cyrush]

rc2 is out, updating to use it

[cyrush]

looks like windows is ok with rc2 -- I am going to update the containers!

[cyrush]

Moving forward with RC2