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

[Trivial] Fix type used for array init #1170

Merged
merged 4 commits into from
Nov 4, 2024
Merged

[Trivial] Fix type used for array init #1170

merged 4 commits into from
Nov 4, 2024

Conversation

pgrete
Copy link
Collaborator

@pgrete pgrete commented Sep 9, 2024 •
edited by Yurlungur
Loading

PR Summary

Clang just warned me about this. Apparently this was introduced because of clang (2fcd219).
Let's see what CI says (haven't tested locally)

PR Checklist

  • Code passes cpplint
  • New features are documented.
  • Adds a test for any bugs fixed. Adds tests for new features.
  • Code is formatted
  • Changes are summarized in CHANGELOG.md
  • Change is breaking (API, behavior, ...)
    • Change is additionally added to CHANGELOG.md in the breaking section
    • PR is marked as breaking
    • Short summary API changes at the top of the PR (plus optionally with an automated update/fix script)
  • CI has been triggered on Darwin for performance regression tests.
  • Docs build
  • (@lanl.gov employees) Update copyright on changed files

@Yurlungur
Copy link
Collaborator

Good catch. Surprised we didn't see that before...

@pgrete
Copy link
Collaborator Author

pgrete commented Sep 10, 2024 

/Users/runner/work/parthenon/parthenon/src/outputs/restart_hdf5.cpp:217:17: error: constexpr variable 'VNDIM' must be initialized by a constant expression
  constexpr int VNDIM = info.VNDIM;
                ^       ~~~~~~~~~~
/Users/runner/work/parthenon/parthenon/src/outputs/restart_hdf5.cpp:217:25: note: function parameter 'info' with unknown value cannot be used in a constant expression
  constexpr int VNDIM = info.VNDIM;
                        ^
/Users/runner/work/parthenon/parthenon/src/outputs/restart_hdf5.cpp:209:64: note: declared here
                                   const OutputUtils::VarInfo &info,
                                                               ^

I guess that's why the constexpr was removed in first place. Given the danger of a rabbit whole I won't be able to look at this before leaving. Will look at this again in two weeks unless someone else figures out a quick fix.

@Yurlungur
Copy link
Collaborator

Pretty sure the following will work:

constexpr int VNDIM = OutputUtils::VarInfo::VNDIM;

will try it and push.

@Yurlungur Yurlungur self-assigned this Sep 10, 2024
@Yurlungur Yurlungur added the bug Something isn't working label Sep 10, 2024
@Yurlungur Yurlungur changed the title Fix type used for array init [Trivial] Fix type used for array init Sep 10, 2024
@Yurlungur Yurlungur enabled auto-merge September 11, 2024 00:14
@Yurlungur Yurlungur disabled auto-merge September 11, 2024 00:14
lroberts36
lroberts36 approved these changes Sep 25, 2024
View reviewed changes
Copy link
Collaborator

@lroberts36 lroberts36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

src/outputs/output_utils.hpp
@@ -47,7 +47,7 @@ namespace OutputUtils {
// Helper struct containing some information about a variable
struct VarInfo {
public:
static constexpr int VNDIM = MAX_VARIABLE_DIMENSION;
static constexpr const int VNDIM = MAX_VARIABLE_DIMENSION;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the extra const here redundant given that it is already constexpr?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so.

@pgrete pgrete enabled auto-merge (squash) November 4, 2024 15:35
@pgrete pgrete merged commit ddc6500 into develop Nov 4, 2024
50 of 53 checks passed
acreyes pushed a commit to acreyes/parthenon that referenced this pull request Nov 14, 2024
@pgrete @jonahm-LANL @acreyes
[Trivial] Fix type used for array init (parthenon-hpc-lab#1170)
0cbbdac 
* Fix type used for array init

* init array with constexpr expression

* CC

---------

Co-authored-by: Jonah Miller <jonahm@lanl.gov>
pgrete added a commit that referenced this pull request Feb 10, 2025
@acreyes @Yurlungur
@jonahm-LANL @lroberts36 @pgrete @brryan @adamdempsey90 @alexrlongne
Add a MeshData variant for refinement tagging (#1182)
58798cb 
* meshdata version of refinement tagging

* got initialization and vector indices working

* fix tensor indices

* added CheckRefinementMesh to fine-advection example

* cleaning up var names

* cleanup

* adding scatter view utilities

* scatterview version of refinement

* burgers-benchmark uses Tag<MeshData>

* add hierarchial par

* cleanup includes

* missed one

* Update CHANGELOG.md

* remove default level tag

* default CheckRefineMesh to true

* respect amr_criteria max_level

* renaming delta_levels->amr_tags, mc->md

* fix refinement/bc order

* docs for CheckRefinementMesh

* move amr_tags array to mesh

* adding comments for ScatterMax view

* it compiles at least

* add easy machinery to register reflecting BCs

* changelog

* swarm bcs differetn from mesh bcs

* use new input block

* typo

* add error checking for swarm/mesh BC consistency

* typo

* phdf diff

* Register reflecting BCs for advection examples

* typo

* silly backwards compatibility thing to make it so you don't have to specify swarm BCs if you're not using swarms

* working

* changelog

* Make everything work

* format

* maybe fix doc issue?

* Address CUDA MPI/ICP issue with Kokkos <=4.4.1 (#1189)

* Jonah's fix for this CI issue

* CHANGELOG

* Remove else from if constexpr when there are returns

* Consolidate buffer packing functions with less atomics (#1199)

* Consolidate buffer packing functions with less atomics

+ Fold in buffer sizing to the load buffer function
+ Use a sort and a discontinuity check instead of an
atomic_fetch_add inside of LoadBuffer_ to get particle
index into buffer
+ Reduce transcendental functions call in particle sourcing in
particle example

* Address PR comments

+ Call the member variable in SwarmKey the sort_key
+ Remove CountParticlesInBuffer function
+ Add buffer_start and buffer_sorted as swarm member variables

* Update example/particles/particles.cpp

Co-authored-by: Ben Ryan <bryan10@illinois.edu>

* Update src/interface/swarm_comms.cpp

Co-authored-by: Ben Ryan <bryan10@illinois.edu>

---------

Co-authored-by: Ben Ryan <bryan10@illinois.edu>
Co-authored-by: Ben Ryan <brryan@lanl.gov>

* [Trivial] Fix type used for array init (#1170)

* Fix type used for array init

* init array with constexpr expression

* CC

---------

Co-authored-by: Jonah Miller <jonahm@lanl.gov>

* Leapfrog fix (#1206)

* Missing send size init

* cleanup, CHANGELOG

* verbose CI

* further CI debugging

* This should be working...

* This should be fixed... but I get a segfault on GPU

* Is it my AMD GPU thats wrong?

* Missing a return statement

* retest

* Oops missing statement

* Revert test

* revert workflow

* removing meshblock amr_criteria

* use pack.UpperBound(b) to check allocation

* remove meshblock first/second derivative from cpp

* linting

---------

Co-authored-by: Jonah Miller <jonah.maxwell.miller@gmail.com>
Co-authored-by: Jonah Miller <jonahm@lanl.gov>
Co-authored-by: Luke Roberts <lfroberts@lanl.gov>
Co-authored-by: Philipp Grete <pgrete@hs.uni-hamburg.de>
Co-authored-by: Ben Ryan <brryan@lanl.gov>
Co-authored-by: Adam Dempsey <adempsey@lanl.gov>
Co-authored-by: Alex Long <along@lanl.gov>
Co-authored-by: Ben Ryan <bryan10@illinois.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yurlungur Yurlungur Yurlungur approved these changes

@lroberts36 lroberts36 lroberts36 approved these changes

@pdmullen pdmullen Awaiting requested review from pdmullen

@BenWibking BenWibking Awaiting requested review from BenWibking

Assignees

@Yurlungur Yurlungur

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pgrete @Yurlungur @lroberts36 @jonahm-LANL