Commit Graph

9332 Commits

Author SHA1 Message Date
Cyrus Harrison
30967f9585 Merge topic 'task/2021_11_adj_opts_parser_include'
5c21e67d7 adjust options parser include path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2623
2021-11-02 15:56:30 -04:00
Cyrus Harrison
5c21e67d7d adjust options parser include path 2021-11-01 11:30:10 -07:00
Ben Boeckel
d2f0f3c990 Merge topic 'cell-set-explicit-message'
1ffc33adf CellSetExplicit: reword warning message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2622
2021-11-01 14:19:47 -04:00
Kenneth Moreland
d9d657eb45 Merge branch 'release' 2021-11-01 13:56:33 -04:00
Kenneth Moreland
a5fe0ba35c Merge topic 'reset-bounds-empty'
61de2faf7 Allow empty bounds in Camera::ResetToBounds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2621
2021-11-01 13:56:33 -04:00
Kenneth Moreland
c5e83c6124 Merge topic 'reset-bounds-empty' into release
61de2faf7 Allow empty bounds in Camera::ResetToBounds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2621
2021-11-01 13:56:33 -04:00
Kenneth Moreland
61de2faf7e Allow empty bounds in Camera::ResetToBounds
Although it is generally wrong to try to call `ResetToBounds` with a
`Bounds` object that does not have a valid range, there are cases where
the range might not be valid. (For example, if `ResetToBounds` was
called in a routine that is rendering an empty scene, it would be best
not to crash.)
2021-11-01 11:02:17 -06:00
Ben Boeckel
1ffc33adf2 CellSetExplicit: reword warning message
ParaView ends up triggering this in its test suite and the "failure"
mention ends up triggering the "failed test" condition in its test
harness. Reword to read more like a warning than an error.
2021-11-01 12:33:41 -04:00
Li-Ta Lo
42c89be5f3 Merge topic 'mergePartitionedDataset'
1355f82a0 fix type mismatch
59364939f remove unnecessary includes and change  to device_sources
8b7f720de remove unnecessary includes
f4605302e add unit test
09db96e58 add merge partitioned dataset capability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2613
2021-11-01 12:17:19 -04:00
Roxana Bujack
1355f82a0c fix type mismatch 2021-11-01 08:12:56 -06:00
Roxana Bujack
59364939f7 remove unnecessary includes and change to device_sources 2021-10-29 15:10:04 -06:00
Roxana Bujack
8b7f720de1 remove unnecessary includes 2021-10-28 15:39:42 -06:00
Roxana Bujack
f4605302ee add unit test 2021-10-28 15:36:20 -06:00
Li-Ta Lo
616d895a4e Merge topic 'ollielo-master-patch-72902'
3dc584321 Merge branch 'ollielo-master-patch-72902' of gitlab.kitware.com:ollielo/vtk-m into ollielo-master-patch-72902
674b0e5db static/anonymous namespace is not allowed in header files
dd9e5acdc static/anonymous namespace is not allowed in header files
b01ba506c Merge branch 'master' into ollielo-master-patch-72902
534fccdba update CI for no_virtual
4817ffbc9 Merge branch 'master' into ollielo-master-patch-72902
35a6b8500 Enable NO_DEPRECATED_VIRTUAL by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2605
2021-10-28 15:56:25 -04:00
Li-Ta Lo
3dc5843211 Merge branch 'ollielo-master-patch-72902' of gitlab.kitware.com:ollielo/vtk-m into ollielo-master-patch-72902 2021-10-28 11:04:03 -06:00
Li-Ta Lo
674b0e5dbc static/anonymous namespace is not allowed in header files 2021-10-28 11:02:45 -06:00
Li-Ta Lo
dd9e5acdc6 static/anonymous namespace is not allowed in header files 2021-10-28 10:54:47 -06:00
Li-Ta Lo
3547a5d804 Merge topic 'multiplexer'
f6877fb39 fixed typo for multiplexer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2618
2021-10-28 12:25:35 -04:00
Li-Ta Lo
f6877fb394 fixed typo for multiplexer 2021-10-28 08:48:21 -06:00
Li-Ta Lo
b01ba506cf Merge branch 'master' into ollielo-master-patch-72902 2021-10-28 08:06:40 -06:00
Li-Ta Lo
f090c3bbbf Merge topic 'no_forced_use'
957192ff5 remove VTKM_FORCE_USED, it is not the right solution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2616
2021-10-28 09:27:38 -04:00
Li-Ta Lo
957192ff5b remove VTKM_FORCE_USED, it is not the right solution 2021-10-27 14:09:10 -06:00
Vicente Bolea
0cef996171 Merge topic 'update-to-v1.7.0-rc1'
9f7ac3a7f 1.7.0-rc1 is our 9th official release of VTK-m.
9ae4a3ed7 Add release notes for 1.7.0-rc1
199dcc1f0 Merge commit '04c43e4c5' into update-to-v1.7.0-rc1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2614
2021-10-21 14:05:39 -04:00
Vicente Adolfo Bolea Sanchez
9f7ac3a7f6 1.7.0-rc1 is our 9th official release of VTK-m.
The major changes to VTK-m from (1.6.0) can be found in:
docs/changelog/1.7/release-notes.md
v1.7.0-rc1
2021-10-21 13:08:50 -04:00
Vicente Adolfo Bolea Sanchez
9ae4a3ed79 Add release notes for 1.7.0-rc1 2021-10-21 13:08:40 -04:00
Vicente Adolfo Bolea Sanchez
199dcc1f0b Merge commit '04c43e4c5' into update-to-v1.7.0-rc1
* commit '04c43e4c5': (376 commits)
  Batch line and text annotations for View1D
  Update code to follow styling and worklet invoker guidelines
  CI: move from only to rules
  CI: fix dependencies in CI jobs
  CI: adjust parallel param hip build
  Adding changelog for cell centered velocities
  added changelog
  Removing unnecessary header
  Updating particle advection filters to use field associativity
  minor fix
  make most of the vtkm_io library not DEVICE_SOURCE
  fixed single/double precision converstion
  add include sstream and see if it clears the dashboard
  remove comment about DeviceAdapter.h
  include DeviceAdapter.h in StorageVirtual.h
  CI: add HIP builing build
  add missing #include
  decouple Timer.h from device compiler
  do not use device compiler to compile source unit tests
  Fix dropped UnknownArrayHandle symbols
  ...
2021-10-21 13:08:08 -04:00
Kenneth Moreland
4d8775ca46 Merge topic 'reproduce-ci-fix'
475261370 Fix newline issue in reproduce_ci_env.py

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2606
2021-10-21 08:34:26 -04:00
Manish Mathai
04c43e4c52 Merge topic 'optimize-annotations-speed'
c62998bd1 Batch line and text annotations for View1D
f7c43960e Update code to follow styling and worklet invoker guidelines
b7470b0af Remove leftover debug statement
8f025a2c5 Batch text and line annotation rendering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2594
2021-10-20 12:22:28 -04:00
Vicente Bolea
d1fd72e71a Merge topic 'fix-ci-rules'
a5aeda724 CI: move from only to rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2610
2021-10-19 19:49:48 -04:00
Manish Mathai
c62998bd1b Batch line and text annotations for View1D 2021-10-19 14:12:18 -07:00
Manish Mathai
f7c43960e5 Update code to follow styling and worklet invoker guidelines 2021-10-19 10:47:56 -07:00
Roxana Bujack
09db96e58e add merge partitioned dataset capability 2021-10-18 15:37:13 -06:00
Vicente Adolfo Bolea Sanchez
a5aeda7240 CI: move from only to rules 2021-10-18 14:36:16 -04:00
Abhishek Yenpure
39934257cb Merge topic 'cell-velocity-field'
5109ba2a7 Adding changelog for cell centered velocities
4e9220ddd Removing unnecessary header
3237c58c2 Updating particle advection filters to use field associativity
79bb38c2b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into cell-velocity-field
a11d9ad10 removing print statements
e28476df5 Assigning default associativity for velocity field
53167f076 Fix Field constructors
e6fa5fd4b Fixing Field class
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2588
2021-10-18 13:00:07 -04:00
Vicente Bolea
f7ac297d68 Merge topic 'fixes-ci-gl'
9ea26d937 CI: fix dependencies in CI jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2609
2021-10-16 16:12:21 -04:00
Li-Ta Lo
9eac2007ce Merge topic 'vtkm_io_sans_device_source'
81fe1254e Merge branch 'master' into vtkm_io_sans_device_source
2c33a23d3 added changelog
1de5fef12 minor fix
5e87ed858 make most of the vtkm_io library not DEVICE_SOURCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2607
2021-10-15 23:25:44 -04:00
Li-Ta Lo
81fe1254ea Merge branch 'master' into vtkm_io_sans_device_source 2021-10-15 19:10:40 -06:00
Vicente Adolfo Bolea Sanchez
9ea26d9372 CI: fix dependencies in CI jobs 2021-10-15 15:37:27 -04:00
Vicente Bolea
386f34aa3b Merge topic 'adjust-params-hip'
e1d8b7270 CI: adjust parallel param hip build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2608
2021-10-15 12:35:33 -04:00
Vicente Adolfo Bolea Sanchez
e1d8b72700 CI: adjust parallel param hip build 2021-10-15 12:24:33 -04:00
Abhishek Yenpure
5109ba2a7d Adding changelog for cell centered velocities 2021-10-15 09:19:12 -07:00
Li-Ta Lo
2c33a23d39 added changelog 2021-10-14 16:42:24 -06:00
Abhishek Yenpure
4e9220ddd3 Removing unnecessary header 2021-10-14 15:21:08 -07:00
Abhishek Yenpure
3237c58c2b Updating particle advection filters to use field associativity 2021-10-14 14:57:36 -07:00
Abhishek Yenpure
79bb38c2b3 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into cell-velocity-field 2021-10-14 14:48:37 -07:00
Li-Ta Lo
1de5fef122 minor fix 2021-10-14 14:42:02 -06:00
Li-Ta Lo
5e87ed858c make most of the vtkm_io library not DEVICE_SOURCE 2021-10-14 12:38:52 -06:00
Li-Ta Lo
14a788bb49 Merge topic 'osc_refactor'
1d2c4c290 fixed single/double precision converstion
e680815d5 add include sstream and see if it clears the dashboard
d59732766 remove comment about DeviceAdapter.h
08ad08b13 Merge branch 'master' into osc_refactor
7add915dd include DeviceAdapter.h in StorageVirtual.h
b9c2ddf9d add missing #include
5448ffb28 decouple Timer.h from device compiler
e90b186ba do not use device compiler to compile source unit tests
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2602
2021-10-14 12:15:20 -04:00
Kenneth Moreland
475261370d Fix newline issue in reproduce_ci_env.py
MR !2598 introduced some fixes to `reproduce_ci_env.py`. One of
them handled newlines in command lists by separating the command
lists by newlines in the Dockerfile (which generated a script).
Although this worked for some of the docker containers, I found
others, like rhel8, where the newlines were not escaped correctly.

Correct this problem by moving back to separating commands with
`&&`. This requires replacing newlines in commands with `&&`.
That in itself is no problem except that if you have a blank
line, you get `&& &&`, which is a syntax error for the shell.
So, avoid this by stripping newlines from commands.
2021-10-14 10:15:02 -06:00
Vicente Bolea
86cc1d1e32 Merge topic 'add-radeon-build'
98a1cc751 CI: add HIP builing build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2521
2021-10-14 12:09:51 -04:00