Skip to content

Conversation

@DrewLazzeriKitware
Copy link
Contributor

@DrewLazzeriKitware DrewLazzeriKitware commented Aug 5, 2021

1) Update some documentation for contributing to pf-keys

2) Fix a bugs found in pf-keys where some keys failed to set when unless set in a particular order

3) Add constraint for lists of names

This change lets us express that one list of names should be a subset of another list of names

Constraint Example

Values for PhaseSources.{phase_name}.GeomNames should be a subset of values from either GeomInput.{geom_input_name}.GeomNames or GeomInput.{geom_input_name}.GeomName. Setting the domain to EnumDomain like so expresses that constraint. A more detailed example can be seen in this test case.

@DrewLazzeriKitware DrewLazzeriKitware changed the title New Yaml Pattern + fixes New Yaml Pattern + small key fixes Aug 5, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title New Yaml Pattern + small key fixes New Yaml Pattern + small fixes Aug 5, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title New Yaml Pattern + small fixes Pf-keys: New Yaml Pattern + small fixes Aug 5, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title Pf-keys: New Yaml Pattern + small fixes Pf-keys: New yaml pattern + small fixes Aug 5, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title Pf-keys: New yaml pattern + small fixes Pf-keys: Add constraint, fix ordering bug, update docs Aug 6, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title Pf-keys: Add constraint, fix ordering bug, update docs Pf-keys: Constrain names of names + bugfix Aug 6, 2021
@DrewLazzeriKitware DrewLazzeriKitware changed the title Pf-keys: Constrain names of names + bugfix Pf-keys: Constrain lists of names + bugfix Aug 6, 2021
@smithsg84
Copy link
Contributor

smithsg84 commented Aug 6, 2021

Is this ready for review? Please mark MR that are not ready with DRAFT: or WIP:

@DrewLazzeriKitware DrewLazzeriKitware changed the title Pf-keys: Constrain lists of names + bugfix (WIP) Pf-keys: Constrain lists of names + bugfix Aug 9, 2021
@DrewLazzeriKitware
Copy link
Contributor Author

DrewLazzeriKitware commented Aug 9, 2021 via email

@DrewLazzeriKitware DrewLazzeriKitware changed the title (WIP) Pf-keys: Constrain lists of names + bugfix Pf-keys: Constrain lists of names + bugfix Aug 10, 2021
@DrewLazzeriKitware
Copy link
Contributor Author

@smithsg84 @jourdain This is now ready for review.

@jourdain
Copy link
Contributor

LGTM, should be ready for review now.

smithsg84
smithsg84 previously approved these changes Aug 10, 2021
@smithsg84
Copy link
Contributor

Several python tests are failing, is this passing in your local env?

https://github.com/parflow/parflow/pull/352/checks?check_run_id=3293124657

@DrewLazzeriKitware
Copy link
Contributor Author

DrewLazzeriKitware commented Aug 10, 2021

I'm looking into these tests which are failing locally on this branch, but not on master:

  • py_clm_file_handling
  • py_from_definition
  • py_pfidb_pfset
  • py_pfset_test
  • py_selection_methods

@jourdain
Copy link
Contributor

jourdain commented Aug 11, 2021

@DrewLazzeriKitware are the tests working locally now?

@DrewLazzeriKitware
Copy link
Contributor Author

@DrewLazzeriKitware are the tests working locally now?

With the change two more are passing. I'm still looking at the remaining three.

@DrewLazzeriKitware
Copy link
Contributor Author

There are three tests still failing on my machine, but I found that the same tests are failing in the master branch on my machine:

py_default_single_3_3_3
py_default_richards_3_3_3
py_simple-mask

@smithsg84 Could we trigger the CI again to see if these clear up?

Squashed commit of the following:

commit 1a24e869dd0436fb5196b2a2a8a6fc62a36c35c4
Author: Drew Lazzeri <drew.lazzeri@kitware.com>
Date:   Wed Aug 11 20:17:38 2021 -0400

    fix handle empty list cases

commit 7a61919db8eb76a6b5a1aa21176d4cd4b9794543
Author: Drew Lazzeri <drew.lazzeri@kitware.com>
Date:   Wed Aug 11 20:11:43 2021 -0400

    Fix select should consider prefixes like _0

commit a7e208197ed79596ed977c04507006bb1edb11ac
Author: Drew Lazzeri <drew.lazzeri@kitware.com>
Date:   Wed Aug 11 20:08:44 2021 -0400

    fix ListHandler comparisons
@DrewLazzeriKitware
Copy link
Contributor Author

I've forced pushed to remove some auto-formatting that made diffs unreadable - the tests pass on the unformatted and pushed version though.

@smithsg84
Copy link
Contributor

The 3_3_3 tests is running a 27 rank tests, that could be failing if your MPI prohibits oversubscribing cores, frequently you can pass extra flags to MPI to enable this (-oversubscribe for OpenMPI) The FindMPI in CMAKE can set extra MPI flags.

https://cmake.org/cmake/help/latest/module/FindMPI.html

The oversubscribing doesn't run to poorly for simple tests. You may also need to turn off busy waiting:

https://github.com/parflow/parflow/wiki/ParFlow-FAQ#how-to-run-parflow-tests-with-a-small-number-of-cores

Not sure why the other test would be failing.

@smithsg84 smithsg84 merged commit 116e954 into parflow:master Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants