mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
d1a4aecc59
We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
126 lines
3.9 KiB
C++
126 lines
3.9 KiB
C++
//============================================================================
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
//
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//============================================================================
|
|
#include <vtkm/cont/ArrayHandleCast.h>
|
|
#include <vtkm/cont/DataSet.h>
|
|
#include <vtkm/cont/Initialize.h>
|
|
|
|
#include <vtkm/io/VTKDataSetReader.h>
|
|
#include <vtkm/io/VTKDataSetWriter.h>
|
|
|
|
#include <vtkm/worklet/CosmoTools.h>
|
|
|
|
#include <algorithm>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
|
|
static const vtkm::cont::LogLevel CosmoLogLevel = vtkm::cont::LogLevel::UserFirst;
|
|
|
|
void TestCosmoHaloFinder(const char* fileName)
|
|
{
|
|
std::cout << std::endl
|
|
<< "Testing Cosmology Halo Finder and MBP Center Finder " << fileName << std::endl;
|
|
|
|
// Open the file for reading
|
|
std::ifstream inFile(fileName);
|
|
if (inFile.fail())
|
|
{
|
|
std::cout << "File does not exist " << fileName << std::endl;
|
|
return;
|
|
}
|
|
|
|
// Read in number of particles and locations
|
|
int nParticles;
|
|
inFile >> nParticles;
|
|
std::size_t size = static_cast<std::size_t>(nParticles);
|
|
|
|
float* xLocation = new float[size];
|
|
float* yLocation = new float[size];
|
|
float* zLocation = new float[size];
|
|
std::cout << "Running Halo Finder on " << nParticles << std::endl;
|
|
|
|
for (vtkm::Id p = 0; p < nParticles; p++)
|
|
{
|
|
inFile >> xLocation[p] >> yLocation[p] >> zLocation[p];
|
|
}
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> xLocArray =
|
|
vtkm::cont::make_ArrayHandleMove<vtkm::Float32>(xLocation, nParticles);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> yLocArray =
|
|
vtkm::cont::make_ArrayHandleMove<vtkm::Float32>(yLocation, nParticles);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> zLocArray =
|
|
vtkm::cont::make_ArrayHandleMove<vtkm::Float32>(zLocation, nParticles);
|
|
|
|
// Output halo id, mbp id and min potential per particle
|
|
vtkm::cont::ArrayHandle<vtkm::Id> resultHaloId;
|
|
vtkm::cont::ArrayHandle<vtkm::Id> resultMBP;
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultPot;
|
|
|
|
// Create the worklet and run it
|
|
vtkm::Id minHaloSize = 20;
|
|
vtkm::Float32 linkingLength = 0.2f;
|
|
vtkm::Float32 particleMass = 1.08413e+09f;
|
|
|
|
{
|
|
VTKM_LOG_SCOPE(CosmoLogLevel, "Executing HaloFinder");
|
|
|
|
vtkm::worklet::CosmoTools cosmoTools;
|
|
cosmoTools.RunHaloFinder(xLocArray,
|
|
yLocArray,
|
|
zLocArray,
|
|
nParticles,
|
|
particleMass,
|
|
minHaloSize,
|
|
linkingLength,
|
|
resultHaloId,
|
|
resultMBP,
|
|
resultPot);
|
|
}
|
|
|
|
xLocArray.ReleaseResources();
|
|
yLocArray.ReleaseResources();
|
|
zLocArray.ReleaseResources();
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Form of the input file in ASCII
|
|
// Line 1: number of particles in the file
|
|
// Line 2+: (float) xLoc (float) yLoc (float) zLoc
|
|
//
|
|
// CosmoHaloFinder data.cosmotools
|
|
//
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
int main(int argc, char* argv[])
|
|
{
|
|
vtkm::cont::SetLogLevelName(CosmoLogLevel, "Cosmo");
|
|
vtkm::cont::SetStderrLogLevel(CosmoLogLevel);
|
|
|
|
auto opts = vtkm::cont::InitializeOptions::DefaultAnyDevice;
|
|
vtkm::cont::InitializeResult config = vtkm::cont::Initialize(argc, argv, opts);
|
|
|
|
if (argc < 2)
|
|
{
|
|
std::cout << "Usage: " << std::endl << "$ " << argv[0] << " <input_file>" << std::endl;
|
|
std::cout << config.Usage << std::endl;
|
|
return 1;
|
|
}
|
|
|
|
#ifndef VTKM_ENABLE_LOGGING
|
|
std::cout << "Warning: turn on VTKm_ENABLE_LOGGING CMake option to turn on timing." << std::endl;
|
|
#endif
|
|
|
|
TestCosmoHaloFinder(argv[1]);
|
|
|
|
return 0;
|
|
}
|