fix conflict

34 jobs for !2575 with hip_support2 in 23 minutes and 43 seconds (queued for 5 seconds)
latest detached
Status Name Job ID Coverage
  Build
passed build:centos7_gcc73 #6154682
build vtkm docker linux cuda-rt large-memory

00:05:27

passed build:centos8_sanitizer #6154683
build vtkm docker linux

00:08:37

passed build:rhel8 #6154684
build vtkm docker linux

00:09:35

passed build:rhel8_vtk_types #6154685
build vtkm docker linux

00:01:58

passed build:ubuntu1604_clang5 #6154687
build vtkm docker linux

00:12:29

passed build:ubuntu1604_gcc5 #6154686
build vtkm docker linux cuda-rt large-memory

00:05:37

passed build:ubuntu1804_clang8 #6154692
build vtkm docker linux

00:04:59

passed build:ubuntu1804_clang_cuda #6154690
build vtkm docker linux cuda-rt large-memory

00:03:51

passed build:ubuntu1804_gcc6 #6154691
build vtkm docker linux

00:04:05

passed build:ubuntu1804_gcc7 #6154689
build vtkm docker linux cuda-rt large-memory

00:04:20

passed build:ubuntu1804_gcc9 #6154688
build vtkm docker linux

00:05:35

passed build:ubuntu1804_kokkos #6154693
build vtkm docker linux cuda-rt large-memory

00:02:02

passed build:ubuntu2004_kokkos #6154694
build vtkm docker linux

00:06:28

passed build:windows_vs2019 #6154695
vtkm nonconcurrent build windows shell vs2019 msvc-19.25 large-memory

00:07:33

 
  Test
passed test:centos7_gcc73 #6154696
test vtkm docker linux cuda-rt turing

00:03:11

passed test:centos8_sanitizer #6154698
test vtkm docker linux privileged

00:02:27

passed test:rhel8 #6154699
test vtkm docker linux

00:00:45

passed test:rhel8_test_centos7 #6154697
test vtkm docker linux cuda-rt turing

00:03:10

passed test:rhel8_vtk_types #6154700
test vtkm docker linux

00:01:25

passed test:ubuntu1604_clang5 #6154702
test vtkm docker linux

00:08:38

passed test:ubuntu1604_gcc5 #6154701
test vtkm docker linux cuda-rt pascal

00:03:08

passed test:ubuntu1804_clang8 #6154707
test vtkm docker linux

00:01:08

passed test:ubuntu1804_clang_cuda #6154705
test vtkm docker linux cuda-rt pascal

00:04:35

passed test:ubuntu1804_gcc6 #6154706
test vtkm docker linux

00:01:01

passed test:ubuntu1804_gcc7 #6154704
test vtkm docker linux cuda-rt turing

00:04:12

passed test:ubuntu1804_gcc9 #6154703
test vtkm docker linux

00:02:35

passed test:ubuntu1804_kokkos #6154708
test vtkm docker linux cuda-rt turing

00:05:21

passed test:ubuntu2004_kokkos #6154709
test vtkm docker linux

00:01:39

passed test:windows_vs2019 #6154710
vtkm nonconcurrent test windows shell vs2019 msvc-19.25 cuda-rt turing

00:00:27

 
  External
passed cdash-buildbot

passed vtk-m-dragnipur-osx-shared-debug+32bit_ids+64bit_coords+clang+tbb

00:01:24

passed vtk-m-dragnipur-osx-static-release+64bit_coords+clang+tbb

00:00:27

failed vtk-m-osheim-windows-shared-debug+ninja-vs-2017+tbb

00:14:47

passed vtk-m-osheim-windows-static-release+ninja-vs-2017+tbb

00:32:57