Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
7,509 Commits 9 Branches 24 Tags 36 MiB
05fcda6c76
Commit Graph

7509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
d9c14e2818 Merge topic 'use_sccache_for_cuda_v3' 
e97973689 Update gitlab-ci to use a version of sccache that supports CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2044
 2020-04-15 22:25:31 -04:00
Robert Maynard
e979736893 Update gitlab-ci to use a version of sccache that supports CUDA 2020-04-15 16:10:53 -04:00
Robert Maynard
f9a35b7c80 Merge topic 'allow_tests_to_run_longer' 
507e87c01 gitlab ci tests jobs now timeout after 50min

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2043
 2020-04-15 15:58:50 -04:00
Robert Maynard
507e87c017 gitlab ci tests jobs now timeout after 50min 
When load is high on machines it can take that long for debug
builds to complete
 2020-04-15 15:08:57 -04:00
Robert Maynard
fdffaac2d2 Merge topic 'flying_edges_support_multi_contour' 
243425421 Flying Edges now works with multiple contours

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2039
 2020-04-15 13:46:27 -04:00
Vicente Bolea
a2c51a3dc7 Merge topic 'refactor-workletinvokerfunctordetail-generalize-returntypes' 
6c7855aed relax ThreadIndicesType requirements for WorkletInvokeFunctorDetail

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2035
 2020-04-15 13:27:08 -04:00
Sujin Philip
c59a203b97 Merge topic 'update-cmake-version' 
c102ea556 Update cmake minimum required version to 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2037
 2020-04-14 09:42:03 -04:00
Robert Maynard
2434254218 Flying Edges now works with multiple contours 2020-04-14 09:21:27 -04:00
Sujin Philip
c102ea556c Update cmake minimum required version to 3.12 2020-04-13 12:42:28 -05:00
Robert Maynard
6b46bfc54b Merge topic 'revert_sccache_changes' 
f6ed4060e Revert "Update gitlab-ci to use a version of sccache that supports CUDA"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2038
 2020-04-10 16:39:56 -04:00
Robert Maynard
f6ed4060ef Revert "Update gitlab-ci to use a version of sccache that supports CUDA" 
This reverts commit 5b469b75a191874abeb8c5cc694fcfba5f0b90c9.
 2020-04-10 16:37:05 -04:00
Vicente Adolfo Bolea Sanchez
6c7855aed8 relax ThreadIndicesType requirements for WorkletInvokeFunctorDetail 
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
 2020-04-10 13:13:35 -04:00
Robert Maynard
b605c3bd8a Merge topic 'update_sccache_to_nvcc_supported_version' 
5b469b75a Update gitlab-ci to use a version of sccache that supports CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2033
 2020-04-10 12:50:18 -04:00
Robert Maynard
5b469b75a1 Update gitlab-ci to use a version of sccache that supports CUDA 2020-04-10 09:15:35 -04:00
Robert Maynard
c48a8bcc2e Merge topic 'replicate_gitlab-ci_env_script' 
24a264fce Add scripts to allow developers to replicate CI environments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2030
 2020-04-09 13:59:40 -04:00
Robert Maynard
24a264fce8 Add scripts to allow developers to replicate CI environments 
To simplify reproducing docker based CI workers locally, VTK-m has python program that handles all the
work automatically for you.

The program is located in `[Utilities/CI/reproduce_ci_env.py ]` and requires python3 and pyyaml.

To use the program is really easy! The following two commands will create the `build:rhel8` gitlab-ci
worker as a docker image and setup a container just as how gitlab-ci would be before the actual
compilation of VTK-m. Instead of doing the compilation, instead you will be given an interactive shell.

```
./reproduce_ci_env.py create rhel8
./reproduce_ci_env.py run rhel8
```

To compile VTK-m from the the interactive shell you would do the following:
```
> src]# cd build/
> build]# cmake --build .
```
 2020-04-09 13:54:20 -04:00
Matt Larsen
450d76d914 Merge topic 'detect_2d_mesh' 
0a6f66986 add whitespace
ecd1512dd render 2d mesh lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2031
 2020-04-08 11:53:14 -04:00
Matt Larsen
0a6f66986c add whitespace 2020-04-07 18:08:02 -07:00
Matt Larsen
ecd1512dd6 render 2d mesh lines 2020-04-07 13:13:10 -07:00
Robert Maynard
e7754ca854 Merge topic 'Fix-MapperGL-PrepForExec-DispatcherMapField' 
4416f8554 Fixing ColorTable::PrepareForExecution and DispatcherMapField

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2028
 2020-04-03 09:57:59 -04:00
Jérôme Dubois
4416f85543 Fixing ColorTable::PrepareForExecution and DispatcherMapField 2020-04-03 14:14:29 +02:00
Kenneth Moreland
48e4446f7d Merge topic 'fix-git-lfs-test' 
e6f86c2ad Only check sentinel-data if testing is enabled
9ad4ad721 Add content to sentinel-data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2022
 2020-04-02 15:22:50 -04:00
Kenneth Moreland
e6f86c2adb Only check sentinel-data if testing is enabled 
If testing is not enabled, then we don't need the files in data.
 2020-04-02 13:20:29 -06:00
Kenneth Moreland
9ad4ad7214 Add content to sentinel-data 
It makes me irrationally nervous to check an empty file as the sentinel
data. Instead, add some text that can be compared agains. Also add some
explenation to the file to prevent naive developers from messing with
the file.
 2020-04-02 13:18:57 -06:00
Robert Maynard
e9129312f5 Merge topic 'correct_contour_tree_augmented_example_compile_failures' 
917919569 contour_tree_augmented example compiles when TBB is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
 2020-04-02 15:09:11 -04:00
Ben Boeckel
65fb96dfcf Merge topic 'lfs-setup-fixups' 
bea0a7e38 hooks: add hook chains for development checks and LFS
867f0a069 SetupForDevelopment: setup lfs hooks
4da3a3dc3 Merge branch 'upstream-GitSetup' into lfs-setup-fixups
7d2569485 GitSetup 2018-06-26 (1ed3dc31)
8b3fa1d61 gitsetup: get the lfs setup script
eadc9b8f3 cmake: unset launcers if testing is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2026
 2020-04-02 14:57:16 -04:00
Vicente Bolea
b23ecc6006 Merge topic 'fix-doxygen-warnings' 
64e35e6fb removed doxygen warning at ArrayHandleRandomUniformBits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2025
 2020-04-02 13:01:52 -04:00
Ben Boeckel
bea0a7e38e hooks: add hook chains for development checks and LFS 2020-04-02 12:51:43 -04:00
Ben Boeckel
867f0a069f SetupForDevelopment: setup lfs hooks 2020-04-02 12:50:43 -04:00
Ben Boeckel
4da3a3dc38 Merge branch 'upstream-GitSetup' into lfs-setup-fixups 
# By GitSetup Upstream
* upstream-GitSetup:
  GitSetup 2018-06-26 (1ed3dc31)
 2020-04-02 12:46:57 -04:00
GitSetup Upstream
7d2569485c GitSetup 2018-06-26 (1ed3dc31) 
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit 1ed3dc3129df9ff28a88dac98fc770af2cdcbb2e (setup).
 2020-04-02 12:46:57 -04:00
Ben Boeckel
8b3fa1d616 gitsetup: get the lfs setup script 2020-04-02 12:46:37 -04:00
Ben Boeckel
eadc9b8f31 cmake: unset launcers if testing is disabled 2020-04-02 12:45:45 -04:00
Vicente Adolfo Bolea Sanchez
64e35e6fbf removed doxygen warning at ArrayHandleRandomUniformBits 2020-04-02 11:49:24 -04:00
Robert Maynard
917919569c contour_tree_augmented example compiles when TBB is enabled 
Fixes #486
 2020-04-02 11:22:09 -04:00
Robert Maynard
6cda22710e Merge topic 'always_use_vtkm_option' 
5061d43f5 vtkm_option should be used as it properly handles CMP0077

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2020
 2020-04-01 14:56:31 -04:00
Robert Maynard
5061d43f5a vtkm_option should be used as it properly handles CMP0077 
Without using vtkm_option, you will run into CMP0077 which
means "option() won't honor normal variables".
 2020-04-01 08:52:07 -04:00
Robert Maynard
ac55c0e551 Merge topic 'disable_deprecation_under_nvcc' 
e37eedadb CUDA doesn't like [[deprecated]] when applied to typedefs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2018
 2020-04-01 08:30:27 -04:00
Robert Maynard
e37eedadb1 CUDA doesn't like [[deprecated]] when applied to typedefs 
So we disable deprecation support when building with `nvcc`
 2020-03-31 14:56:49 -04:00
Kenneth Moreland
e18ecf4168 Merge topic 'unused-param-warning' 
2016aa01d Fix unused parameter warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2017
 2020-03-31 10:59:31 -04:00
Robert Maynard
6e26bfca62 Merge topic 'convert_more_builders' 
0ea77c8df gitlab-ci nightly gcc 6 and 7 builders to improve coverage
08a27bdcd gitlab-ci now has a clang-5 builder
16a295201 gitlab-ci options for docs, examples, and benchmarks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2016
 2020-03-31 09:20:42 -04:00
Kenneth Moreland
2016aa01d5 Fix unused parameter warnings 
One of the dashboard compilers (gcc 4.8 with cuda, I think) was giving
warnings about an unused parameter. Apparently, the compiler did not
like the parameters defined for `default` assignment operators.
 2020-03-30 14:45:40 -06:00
Robert Maynard
0ea77c8df9 gitlab-ci nightly gcc 6 and 7 builders to improve coverage 
This builds used to happen on renar
 2020-03-30 12:49:05 -04:00
Robert Maynard
08a27bdcd8 gitlab-ci now has a clang-5 builder 
This was once covered by the dejagore dashboard
 2020-03-30 12:49:05 -04:00
Robert Maynard
16a295201b gitlab-ci options for docs, examples, and benchmarks 2020-03-30 12:49:05 -04:00
Robert Maynard
cd1a5baba3 Merge topic 'restrict_gitlab-ci' 
cbed21696 gitlab-ci won't trigger when just pushing remote branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2014
 2020-03-30 12:48:11 -04:00
Robert Maynard
cbed21696d gitlab-ci won't trigger when just pushing remote branches 
At the same time I have added the controls to allow for master only
builders which is required for nightly ubsan/asan testing
 2020-03-30 09:51:45 -04:00
James Kress
9eaaadb1bd Merge topic 'Enhance-Testing-From-File' 
46d7d1865 Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File
f8b425adb Updating data README format and name.
95ba497bb Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File
f21f99b43 Fixing cmake case.
ad47be5a1 Adding ctest check.
c03e84527 File not added.
41f64930c Fixing file location.
9ccd91164 Fixing file location.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1986
 2020-03-27 14:34:16 -04:00
James
46d7d1865a Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File 2020-03-27 11:33:18 -04:00
Robert Maynard
b6a92c940b Merge topic 'fixed_point_write' 
cad7b593d Fix warning.
7da30d254 Write data in fixed point, not scientific notation. Increase performance by removing buffer flushes.
98dbf7c1a Replace spaces by underscores in SCALAR name field.
b3d170f2d Compound datatypes for writer.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2001
 2020-03-27 08:41:25 -04:00