Commit b091d195 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

Remove files not relevant for ParaView.

Removed data.md and dashboard.md files which are not relevant for
ParaView. We'll just link to VTK's data.md for now since the two are
going to be identical.
parent debf30d9
VTK Dashboard Scripts
=====================
This page documents how to use the VTK `dashboard` branch in [Git][].
See the [README](README.md) for more information.
[Git]: http://git-scm.com
Using the Dashboard Scripts
---------------------------
The `dashboard` branch contains a dashboard client helper script.
Use these commands to track it:
$ mkdir -p ~/Dashboards/VTKScripts
$ cd ~/Dashboards/VTKScripts
$ git init
$ git remote add -t dashboard origin https://gitlab.kitware.com/vtk/vtk.git
$ git pull origin
The `vtk_common.cmake` script contains setup instructions in its
top comments.
Update the `dashboard` branch to get the latest version of this
script by simply running:
$ git pull
Here is a link to the script as it appears today: [vtk_common.cmake][].
[vtk_common.cmake]: https://gitlab.kitware.com/vtk/vtk/tree/dashboard/vtk_common.cmake
Changing the Dashboard Scripts
------------------------------
If you find bugs in the hooks themselves or would like to add new features,
the can be edited in the usual Git manner:
$ git checkout -b my-topic-branch
Make your edits, test it, and commit the result. Create a patch file with:
$ git format-patch origin/dashboard
And email the results to the developer's mailing list.
VTK Data
========
This page documents how to add test data while developing VTK with [Git][].
See the [README](README.md) for more information.
[Git]: http://git-scm.com
Setup
-----
The workflow below depends on local hooks to function properly.
Follow the main [developer setup instructions](develop.md#setup)
before proceeding. In particular, run [SetupForDevelopment.sh][]:
$ ./Utilities/SetupForDevelopment.sh
[SetupForDevelopment.sh]: /Utilities/SetupForDevelopment.sh
Workflow
--------
Our workflow for adding data integrates with our standard Git
[development process](develop.md). Start by
[creating a topic](develop.md#create-a-topic).
Return here when you reach the "edit files" step.
These instructions follow a typical use case of adding a new
test with a baseline image.
### Add Test ###
1. Write a new test, e.g.
$ edit Some/Module/Testing/Cxx/MyTest.cxx
2. Edit the corresponding `CMakeLists.txt` file:
$ edit Some/Module/Testing/Cxx/CMakeLists.txt
and add the test in a `vtk_add_test_...` call (which references
baselines automatically).
3. For tests not using such a call, reference the data file in an
`ExternalData_add_test` call. Specify the file inside `DATA{...}`
using a path relative to the test directory:
$ edit Some/Module/Testing/Cxx/CMakeLists.txt
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-MyTest
COMMAND ${vtk-module}CxxTests MyTest
... -V DATA{../Data/Baseline/MyTest.png,:} ...
)
Notes:
* If the data file references other data files, e.g. `.mhd -> .raw`,
read the [ExternalData][] module documentation on "associated" files.
* Multiple baseline images and other series are handled automatically
when the reference ends in the `,:` option. Read [ExternalData][]
module documentation for details.
[ExternalData]: /CMake/ExternalData.cmake
### Build and Run the Test ###
If you already have a data file, skip to the [next step](#add-data) to add it.
Otherwise, use the following steps to produce a test baseline image file.
We assume a build tree has been previously generated by CMake.
1. Switch to the build tree:
$ cd ../VTK-build
2. Run CMake:
$ cmake .
Since we have not yet created the baseline image data file, CMake
will warn that it does not exist but proceed to generate the test
anyway.
3. Build
$ make
4. Run the test
$ ctest -R MyTest
It will fail but place the baseline image in `Testing/Temporary`.
5. Switch back to the source tree:
$ cd ../VTK
### Add Data ###
Copy the data file into your local source tree.
$ mkdir -p Some/Module/Testing/Data/Baseline
$ cp ../VTK-build/Testing/Temporary/MyTest.png Some/Module/Testing/Data/Baseline
### Run CMake ###
1. Switch to the build tree:
$ cd ../VTK-build
2. Run CMake:
$ cmake .
CMake will [move the original file](#externaldata). Keep your own
copy if necessary. See [below](#recover-data-file) to recover the
original file.
During configuration CMake will display a message such as:
Linked Some/Module/Testing/Data/Baseline/MyTest.png.md5 to ExternalData MD5/...
This means that CMake converted the file into a data object referenced
by a "content link" named like the original file but with a `.md5`
extension. CMake also [renamed the original file](#externaldata).
3. Build
$ make
During the build, the [ExternalData][] module will make the data
file available where the test expects to find it.
4. Run the test
$ ctest -R MyTest
It should pass using the new data file.
5. Switch back to the source tree:
$ cd ../VTK
### Commit ###
Continue to [create the topic](develop.md#create-a-topic) and edit other
files as necessary. Add the content link and commit it along with the
other changes:
$ git add Some/Module/Testing/Data/Baseline/MyTest.png.md5
$ git add Some/Module/Testing/Data/CMakeLists.txt
$ git commit
The local `pre-commit` hook will display a message such as:
Some/Module/Testing/Data/Baseline/MyTest.png.md5: Added content to Git at refs/data/MD5/...
Some/Module/Testing/Data/Baseline/MyTest.png.md5: Added content to local store at .ExternalData/MD5/...
Content link Some/Module/Testing/Data/Baseline/MyTest.png.md5 -> .ExternalData/MD5/...
This means that the pre-commit hook recognized that the content link
references a new data object and [prepared it for upload](#pre-commit).
### Push ###
Follow the instructions to [share the topic](develop.md#share-a-topic).
When you push it to GitLab for review using
$ git gitlab-push
part of the output will be of the form:
* ...:refs/data/... [new branch]
* HEAD:refs/heads/my-topic [new branch]
Pushed refs/data/... and removed local ref.
This means that the `git-gitlab-push` script pushed the topic
and [uploaded the data](#git-gitlab-push) it references.
Options for `gitlab-push` include:
* `--dry-run`: Report push that would occur without actually doing it
* `--no-topic`: Push the data referenced by the topic but not the topic itself
Note: One must `git gitlab-push` from the same work tree as was used
to create the commit. Do not `git push` to another computer first and
try to push to GitLab from there because the data will not follow.
Building
--------
### Download ###
For the test data to be downloaded and made available to the tests in
your build tree the `VTKData` target must be built. One may build the
target directly, e.g. `make VTKData`, to obtain the data without a
complete build. The output will be something like
-- Fetching ".../ExternalData/MD5/..."
-- [download 100% complete]
-- Downloaded object: "VTK-build/ExternalData/Objects/MD5/..."
The downloaded files appear in `VTK-build/ExternalData` by default.
### Local Store ###
It is possible to configure one or more local ExternalData object
stores shared among multiple builds. Configure for each build the
advanced cache entry `ExternalData_OBJECT_STORES` to a directory on
your local disk outside all build trees, e.g. `/home/user/.ExternalData`:
$ cmake -DExternalData_OBJECT_STORES=/home/user/.ExternalData ../VTK
The [ExternalData][] module will store downloaded objects in the local
store instead of the build tree. Once an object has been downloaded
by one build it will persist in the local store for re-use by other
builds without downloading again.
Discussion
----------
A VTK test data file is not stored in the main source tree under version
control. Instead the source tree contains a "content link" that refers
to a data object by a hash of its content. At build time the
[ExternalData][] module fetches data needed by enabled tests.
This allows arbitrarily large data to be added and removed without
bloating the version control history.
The above [workflow](#workflow) allows developers to add a new data file
almost as if committing it to the source tree. The following subsections
discuss details of the workflow implementation.
### ExternalData ###
While [CMake runs](#run-cmake) the [ExternalData][] module evaluates
[DATA{} references](#add-test). VTK [sets](/CMake/vtkExternalData.cmake)
the `ExternalData_LINK_CONTENT` option to `MD5` to enable automatic
conversion of raw data files into content links. When the module detects
a real data file in the source tree it performs the following
transformation as specified in the module documentation:
* Compute the MD5 hash of the file
* Store the `${hash}` in a file with the original name plus `.md5`
* Rename the original file to `.ExternalData_MD5_${hash}`
The real data now sit in a file that we [tell Git to ignore](/.gitignore).
For example:
$ cat Some/Module/Testing/Data/Baseline/.ExternalData_MD5_477e602800c18624d9bc7a32fa706b97 |md5sum
477e602800c18624d9bc7a32fa706b97 -
$ cat Some/Module/Testing/Data/Baseline/MyTest.png.md5
477e602800c18624d9bc7a32fa706b97
#### Recover Data File ####
To recover the original file after running CMake but before committing,
undo the operation:
$ cd Some/Module/Testing/Data/Baseline
$ mv .ExternalData_MD5_$(cat MyTest.png.md5) MyTest.png
### pre-commit ###
While [committing](#commit) a new or modified content link the
[pre-commit](/Utilities/Scripts/pre-commit) hook moves the real data
object from the `.ExternalData_MD5_${hash}` file left by the
[ExternalData][] module to a local object repository stored in a
`.ExternalData` directory at the top of the source tree.
The hook also uses Git plumbing commands to store the data object
as a blob in the local Git repository. The blob is not referenced
by the new commit but instead by `refs/data/MD5/${hash}`.
This keeps the blob alive in the local repository but does not add
it to the project history. For example:
$ git for-each-ref --format="%(refname)" refs/data
refs/data/MD5/477e602800c18624d9bc7a32fa706b97
$ git cat-file blob refs/data/MD5/477e602800c18624d9bc7a32fa706b97 | md5sum
477e602800c18624d9bc7a32fa706b97 -
### git gitlab-push ###
The `git gitlab-push` command is actually an alias for the
[git-gitlab-push](/Utilities/GitSetup/git-gitlab-push) script.
In addition to pushing the topic branch to Gerrit the script also detects
content links added or modified by the commits in the topic.
It reads the data object hashes from the content links and looks for
matching `refs/data/` entries in the local Git repository.
The script pushes the matching data objects to your VTK GitLab fork.
For example:
$ git gitlab-push --dry-run --no-topic
* refs/data/MD5/477e602800c18624d9bc7a32fa706b97:refs/data/MD5/477e602800c18624d9bc7a32fa706b97 [new branch]
Pushed refs/data/MD5/477e602800c18624d9bc7a32fa706b97 and removed local ref.
A GitLab webhook that triggers whenever a topic branch is pushed checks
for `refs/data/` in your VTK GitLab fork, fetches them, erases the refs
from your fork, and uploads them to a location that we
[tell ExternalData to search](/CMake/vtkExternalData.cmake) at build time.
### Publishing Data for an External Branch ###
The above [workflow](#workflow) works well for developers working on a
single machine to contribute changes directly to upstream VTK. When
working in an external branch of VTK, perhaps during a long-term topic
development effort, data objects need to be published separately.
The workflow for adding data to an external branch of VTK is the same
as the above through the [commit](#commit) step, but diverges at the
[push](#push) step because one will push to a separate repository.
Our ExternalData infrastructure intentionally hides the real data files
from Git so only the content links (`.md5` files) will be pushed.
The real data objects will still be left in the `.ExternalData/MD5`
directory at the top of the VTK source tree by the
[pre-commit](#pre-commit) hook.
The `.ExternalData` directory must be published somewhere visible to
other machines that want to use the data, such as on a web server.
Once that is done then other machines can be told where to look for
the data, e.g.
cmake ../VTK "-DExternalData_URL_TEMPLATES=https://username.github.io/VTK/ExternalData/%(algo)/%(hash)
In this example we assume the files are published on a [Github Pages][]
`gh-pages` branch in `username`'s fork of VTK.
Within the `gh-pages` branch the files are placed at
`ExternalData/MD5/$md5sum` where `$md5sum` is the MD5 hash of the content
(these are the same names they have in the `.ExternalData` directory in
the original source tree).
[Github Pages]: https://help.github.com/articles/creating-project-pages-manually
......@@ -101,7 +101,8 @@ A reader should have a general idea of the feature or fix to be developed given
$ git commit
Caveats:
* To add data follow [these instructions](data.md).
* To add data follow [these instructions](https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md),
from VTK.
Share a Topic
-------------
......@@ -128,7 +129,7 @@ signed in for [GitLab Access][] and created your fork by visiting the main
Notes:
* If you are revising a previously pushed topic and have rewritten the
topic history, add `-f` or `--force` to overwrite the destination.
* If the topic adds data see [this note](data.md#push).
* If the topic adds data see [this note](https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md#push).
The output will include a link to the topic branch in your fork in GitLab
and a link to a page for creating a Merge Request.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment