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.

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

Reduce code differences between HDF5 1.8 and 1.10 #38

Merged
merged 15 commits into from
Nov 12, 2020
Merged

Reduce code differences between HDF5 1.8 and 1.10 #38

merged 15 commits into from
Nov 12, 2020

Conversation

byrnHDF
Copy link
Contributor

@byrnHDF byrnHDF commented Oct 15, 2020

Mostly comments and whitespace.
Other changes are initialization statements (includes hid_t H5I_INVALID return values on errors) and simple brackets.
The goal was to reduce diffs between 1.10 and 1.8.
The FD and TS files had more extensive changes to reorder the functions to more closely match the order of those in 1.10.

Comments, whitespace
Simple init and if block brackets.
Minimal code changes limited to return value and spelling
@@ -0,0 +1,252 @@
# This file was generated.
Copy link
Collaborator

Choose a reason for hiding this comment

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

If autogen.sh is added, we will also need a .gitignore file, which will ignore the files in autom4te.cache and others, notably Makefile.ins if we're going to full autogen.sh mode. Otherwise I'm not sure we should check in the Makefile.in changes for a newer version of automake which will revert to the older version when regenerated on jelly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I forgot to remove that!
OR
should we add it?

Copy link
Member

Choose a reason for hiding this comment

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

We decided that the 1.8 branch would not get the autotools changes that went to what became 1.10. autogen.sh and the updated configure options should not be propagated to 1.8 without more discussion.

-rm -f ./$(DEPDIR)/tobject.Po
-rm -f ./$(DEPDIR)/trefer.Po
-rm -f ./$(DEPDIR)/ttypes.Po
-rm -f ./$(DEPDIR)/tvlstr.Po
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm just curious, why are these listed individual instead of using wildcard? Should I do something differently with the files?

@lrknox
Copy link
Collaborator

lrknox commented Oct 15, 2020 via email

Copy link
Member

@derobins derobins left a comment

Choose a reason for hiding this comment

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

Need to fix the autotools issues before this can be approved.

@byrnHDF
Copy link
Contributor Author

byrnHDF commented Oct 19, 2020

autotools reverted and other fixes for VFD options

@derobins
Copy link
Member

There is way too much stuff going on in this PR for me to do anything other than blindly click the 'approve' button, especially given how bad github is as a code review tool.

Problems:

  • Too many 'ideas' in a single PR.
  • Significant autotools churn. If we're going to keep 1.8 around we might want to consider bringing over the 1.10+ autotools changes.
  • We need a code review tool that works well for large PRs. Can we wire up Fisheye/Crucible or something similar to handle this? It'd have to be the online version since our last install was wildly out of date.

@lrknox
Copy link
Collaborator

lrknox commented Oct 21, 2020

Autotools files have been restored to previous state; bin/reconfigure runs on jelly, changing only 2 trace lines in src/H5FDhdfs.c.
Test configurations with c++, fortran, fortran2003, ros3, libhdfs, szip, zlib and parallel (separate from c++) compile and pass all tests now.

@lrknox lrknox self-requested a review October 21, 2020 17:00
@derobins derobins changed the title Hdf5 1 8 Reduce code differences between HDF5 1.8 and 1.10 Oct 22, 2020
@lrknox lrknox merged commit aab84e7 into HDFGroup:hdf5_1_8 Nov 12, 2020
vchoi-hdfgroup added a commit that referenced this pull request Dec 7, 2021
mattjala added a commit to mattjala/hdf5 that referenced this pull request Jan 24, 2025
* Integrate MT ID test with testframe testing framework

* Add environment variable to testframe framework for max. threads

Adds an environment variable to make it easier for CMake CI to specify
the maximum number of threads that multi-threaded tests can spawn in
addition to the main thread

* Update for const changes and handle errors at coarse granularity

---------

Co-authored-by: Matt L <[email protected]>
mattjala pushed a commit to mattjala/hdf5 that referenced this pull request Jan 24, 2025
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.

5 participants