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

arm64 updates #331

Merged
merged 2 commits into from
Jul 10, 2024
Merged

arm64 updates #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc7ab69
build: use gtest version 1.14.0
Jun 6, 2024
d7e1cd7
build: use std::shuffle rather than deprecated/removed std::random_sh…
Jun 6, 2024
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
4 changes: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ if (BUILD_TESTING)
CPMAddPackage(
NAME GTest
GITHUB_REPOSITORY google/googletest
# post 1.10.0 with cmake_minimum_required updated
GIT_TAG 32f4f52d95dc99c35f51deed552a6ba700567f94
VERSION 1.10.0
VERSION 1.14.0
OPTIONS
"INSTALL_GTEST OFF"
"gtest_force_shared_crt ON"
Expand Down
7 changes: 5 additions & 2 deletions src/libpsc/psc_collision/psc_collision_impl.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <cmath>
#include <numeric>
#include <random>

extern void* global_collision; // FIXME

Expand Down Expand Up @@ -164,11 +165,11 @@ struct CollisionHost
// ----------------------------------------------------------------------
// randomize_in_cell

static std::vector<int> randomize_in_cell(int n_start, int n_end)
std::vector<int> randomize_in_cell(int n_start, int n_end)
{
std::vector<int> permute(n_end - n_start);
std::iota(permute.begin(), permute.end(), n_start);
std::random_shuffle(permute.begin(), permute.end());
std::shuffle(permute.begin(), permute.end(), rng_);
return permute;
}

Expand Down Expand Up @@ -265,6 +266,8 @@ private:
double nu_;
int interval_;

std::mt19937 rng_;

public: // FIXME
// for output
Mfields mflds_stats_;
Expand Down
Loading