Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update clang-format #661

Merged
merged 3 commits into from
Aug 24, 2023
Merged

Update clang-format #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
074429e
Update .clang-format empty lines at start of block
streeve Aug 9, 2023
f3b2008
apply format
streeve Aug 9, 2023
21b4d34
Update .clang-format break after return type
streeve Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ IndentWidth: 4
SpacesInParentheses: true
BreakConstructorInitializersBeforeComma: true
PointerAlignment: Left
AlwaysBreakAfterReturnType: None
KeepEmptyLinesAtTheStartOfBlocks: false
1 change: 0 additions & 1 deletion benchmark/cajita/Cajita_HaloPerformance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ void performanceTest( std::ostream& stream,
// Now we loop over halo sizes up to the size allocated to compare.
for ( int halo_width = 0; halo_width < halo_width_size; ++halo_width )
{

// Create timers
std::stringstream halo_create_name;
halo_create_name << test_prefix << "halo_create_" << halo_width;
Expand Down
1 change: 0 additions & 1 deletion benchmark/core/Cabana_NeighborVerletPerformance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
// Loop over cell ratios (linked cell grid relative to cutoff)
for ( int c1 = 0; c1 < cell_ratios_size; ++c1 )
{

// Create timers.
std::stringstream create_time_name;
create_time_name << test_prefix << "neigh_create_"
Expand Down
2 changes: 0 additions & 2 deletions cajita/src/Cajita_SparseDimPartitioner.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ class SparseDimPartitioner : public BlockPartitioner<NumSpaceDim>
std::vector<int>& rec_partition_j,
std::vector<int>& rec_partition_k )
{

int max_size = 0;
for ( std::size_t d = 0; d < num_space_dim; ++d )
max_size =
Expand Down Expand Up @@ -887,7 +886,6 @@ class SparseDimPartitioner : public BlockPartitioner<NumSpaceDim>

void allocate( const std::array<int, num_space_dim>& global_cells_per_dim )
{

_workload_per_tile = workload_view(
Kokkos::view_alloc( Kokkos::WithoutInitializing,
"workload_per_tile" ),
Expand Down
1 change: 0 additions & 1 deletion cajita/src/Cajita_SparseIndexSpace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ struct TileID2HashKey<Key, HashTypes::Morton>
//! Constructor (Host) from three integers
TileID2HashKey( int i, int j, int k )
{

_tile_num[0] = i;
_tile_num[1] = j;
_tile_num[2] = k;
Expand Down
2 changes: 0 additions & 2 deletions cajita/unit_test/tstPartitioner.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ namespace Test
template <typename PartitionerType>
void owned_cell_info_test_3d( PartitionerType& partitioner )
{

// Create Ground Truth Settings
std::array<int, 3> local_num_cell = { 104, 55, 97 };
std::array<int, 3> global_num_cell = { 0, 0, 0 };
Expand Down Expand Up @@ -87,7 +86,6 @@ void owned_cell_info_test_3d( PartitionerType& partitioner )
template <typename PartitionerType>
void owned_cell_info_test_2d( PartitionerType& partitioner )
{

// Create Ground Truth Settings
std::array<int, 2> local_num_cell = { 69, 203 };
std::array<int, 2> global_num_cell = { 0, 0 };
Expand Down
2 changes: 0 additions & 2 deletions cajita/unit_test/tstSparseLocalGrid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ void sparseLocalGridTest( EntityType t2 )
}
if ( cart_rank[Dim::J] > 0 )
{

auto owned_shared_tile_space =
local_grid_ptr->sharedTileIndexSpace<2>( Own(), t2, 0, -1, 0 );
EXPECT_EQ( owned_shared_tile_space.min( Dim::I ) *
Expand Down Expand Up @@ -278,7 +277,6 @@ void sparseLocalGridTest( EntityType t2 )
}
if ( cart_rank[Dim::J] + 1 < cart_dims[Dim::J] )
{

auto owned_shared_tile_space =
local_grid_ptr->sharedTileIndexSpace<2>( Own(), t2, 0, 1, 0 );
EXPECT_EQ( owned_shared_tile_space.min( Dim::I ) *
Expand Down
1 change: 0 additions & 1 deletion example/cajita_tutorial/11_structured_solver/structured_solver_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
//---------------------------------------------------------------------------//
void structuredSolverExample()
{

/*
In this example we will demonstrate building a Cajita Reference Conjugate
Gradient Solver that solves a Poisson equation with designated solution
Expand Down
1 change: 0 additions & 1 deletion example/core_tutorial/13_hdf5_output/hdf5_output_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ void hdf5_output()

int main( int argc, char* argv[] )
{

MPI_Init( &argc, &argv );
Kokkos::initialize( argc, argv );

Expand Down
Loading