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

Update to v25.1.0-IOFreeze #5354

Merged
merged 14 commits into from
Mar 11, 2025
Merged

Update to v25.1.0-IOFreeze #5354

merged 14 commits into from
Mar 11, 2025

Conversation

joseph-robertson
Copy link
Collaborator

Pull request overview

Pull Request Author

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@joseph-robertson joseph-robertson added the Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. label Feb 25, 2025
Copy link
Collaborator

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

Also missing some new variables / variable renames. Will add that shortly: edit see 5c83dd1

@jmarrec jmarrec force-pushed the v25.1.0-IOFreeze branch from ea567ca to d20b26c Compare March 5, 2025 10:58
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 5, 2025

@joseph-robertson I think your clang format is outdated since you pushed formatting diffs. CI uses 18.1.3.

@jmarrec jmarrec force-pushed the v25.1.0-IOFreeze branch 3 times, most recently from f5d6fc8 to 1d5a877 Compare March 6, 2025 09:01
@jmarrec jmarrec force-pushed the v25.1.0-IOFreeze branch from 1d5a877 to 18c9246 Compare March 6, 2025 09:07
CMakeLists.txt Outdated
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 29616d6aa23e2fc0f71362da9794ef08)
set(ENERGYPLUS_EXPECTED_HASH 8a7336112955e90c525cf78fd33ce927)
Copy link
Collaborator

@jmarrec jmarrec Mar 6, 2025

Choose a reason for hiding this comment

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

Unfortunately that release is missing the intel mac package which explains why the CI fails for that.
(and doesn't have the arm64 ubuntu ones)

We could use my release here: https://github.com/jmarrec/EnergyPlus/releases/tag/v25.1.0-IOFreeze-Ubuntu-arm64-macfixup

@jmarrec
Copy link
Collaborator

jmarrec commented Mar 6, 2025

@wenyikuang mac is still having issues, can you have a look please?

https://ci.openstudio.net/blue/organizations/jenkins/openstudio-incremental-osx/detail/PR-5354/12/pipeline#step-65-log-38

-- Conan: Target declared 'Ruby::Ruby'
CMake Error at /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/cmakedeps_macros.cmake:67 (message):
  Library 'ruby.3.2-static' not found in package.  If 'ruby.3.2-static' is a
  system library, declare it with 'cpp_info.system_libs' property
Call Stack (most recent call first):
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/Ruby-Target-relwithdebinfo.cmake:23 (conan_package_library_targets)
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/RubyTargets.cmake:24 (include)
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/RubyConfig.cmake:16 (include)
  CMakeLists.txt:431 (find_package)

@wenyikuang
Copy link
Collaborator

@wenyikuang mac is still having issues, can you have a look please?

https://ci.openstudio.net/blue/organizations/jenkins/openstudio-incremental-osx/detail/PR-5354/12/pipeline#step-65-log-38

-- Conan: Target declared 'Ruby::Ruby'
CMake Error at /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/cmakedeps_macros.cmake:67 (message):
  Library 'ruby.3.2-static' not found in package.  If 'ruby.3.2-static' is a
  system library, declare it with 'cpp_info.system_libs' property
Call Stack (most recent call first):
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/Ruby-Target-relwithdebinfo.cmake:23 (conan_package_library_targets)
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/RubyTargets.cmake:24 (include)
  /Users/jenkins/git/OpenStudioIncremental/OS-build-release-v2/RubyConfig.cmake:16 (include)
  CMakeLists.txt:431 (find_package)

Yeah, fixing it now.

@joseph-robertson
Copy link
Collaborator Author

@joseph-robertson I think your clang format is outdated since you pushed formatting diffs. CI uses 18.1.3.

I think you're right. I updated it, ran it again, and have no diffs.

@jmarrec jmarrec marked this pull request as ready for review March 11, 2025 08:33
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 11, 2025

I'm in the process of running an OpenStudio-resources 3 way comparison between OS 3.9.0-E+ 24.2.0, Transition to 25.1.0-IOFreeze, and OS 3.10.0-alpha-E+ 25.1.0-IOFreeze (This PR).

Will report back when I'm done

@joseph-robertson FYI

@jmarrec
Copy link
Collaborator

jmarrec commented Mar 11, 2025

@jmarrec jmarrec merged commit 22cfabc into develop Mar 11, 2025
4 of 6 checks passed
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 11, 2025

LGTM!

@jmarrec jmarrec mentioned this pull request Mar 11, 2025
5 tasks
@jmarrec jmarrec deleted the v25.1.0-IOFreeze branch March 11, 2025 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
IDDChange Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to EnergyPlus 25.1.0
4 participants