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

Collected small bugfixes and changes #1504

Merged
merged 6 commits into from Jun 12, 2019

Conversation

@akohlmey
Copy link
Member

commented Jun 10, 2019

Summary

This pull request combines multiple small bugfixes and updates

Author(s)

Axel Kohlmeyer (Temple U)

Licensing

By submitting this pull request, I agree, that my contribution will be included in LAMMPS and redistributed under either the GNU General Public License version 2 (GPL v2) or the GNU Lesser General Public License version 2.1 (LGPL v2.1).

Backward Compatibility

yes

Implementation Notes

The following individual changes are included:

  • update the info variable command to correctly handle internal style variables
  • fix a bug in with string variable expansions, where malloc()/free() were mixed with new/delete
  • fix a bug in CMakeLists.txt where C++ needs to be used to check for include files when C is not enabled. merged with upstream to include alternate version of the bugfix and added some cleanup

Post Submission Checklist

Please check the fields below as they are completed after the pull request has been submitted. Delete lines that don't apply

  • The feature or features in this pull request is complete
  • Licensing information is complete
  • Corresponding author information is complete
  • The source code follows the LAMMPS formatting guidelines
  • Suitable new documentation files and/or updates to the existing docs are included
  • The added/updated documentation is integrated and tested with the documentation build system
  • The feature has been verified to work with the conventional build system
  • The feature has been verified to work with the CMake based build system
  • A package specific README file has been included or updated
  • One or more example input decks are included

Further Information, Files, and Links

Put any additional information here, attach relevant text or image files, and URLs to external sites (e.g. DOIs or webpages)

akohlmey added some commits Jun 10, 2019

akohlmey added a commit to rbberger/lammps that referenced this pull request Jun 11, 2019

@akohlmey akohlmey self-assigned this Jun 11, 2019

@@ -1135,7 +1135,7 @@ endif()

if(PKG_USER-INTEL)
include(CheckIncludeFile)
check_include_file(immintrin.h FOUND_IMMINTRIN)
check_include_file_cxx(immintrin.h FOUND_IMMINTRIN)

This comment has been minimized.

Copy link
@junghans

junghans Jun 11, 2019

Member

You will need to update the include above as well.

This comment has been minimized.

Copy link
@akohlmey

akohlmey Jun 11, 2019

Author Member

not really needed here, since this is already included globally.

akohlmey added some commits Jun 11, 2019

Merge branch 'collected-small-fixes' of github.com:akohlmey/lammps in…
…to collected-small-fixes

# Conflicts:
#	cmake/CMakeLists.txt

@akohlmey akohlmey requested review from athomps, stanmoore1 and sjplimp Jun 11, 2019

@akohlmey akohlmey marked this pull request as ready for review Jun 11, 2019

@akohlmey akohlmey requested a review from rbberger as a code owner Jun 11, 2019

@sjplimp
Copy link
Contributor

left a comment

ok

@akohlmey akohlmey merged commit 0b25d2f into lammps:master Jun 12, 2019

6 checks passed

lammps/pull-requests/build-docs-pr head run ended
Details
lammps/pull-requests/cmake/cmake-serial-pr head run ended
Details
lammps/pull-requests/kokkos-omp-pr head run ended
Details
lammps/pull-requests/openmpi-pr head run ended
Details
lammps/pull-requests/serial-pr head run ended
Details
lammps/pull-requests/shlib-pr head run ended
Details

@akohlmey akohlmey deleted the akohlmey:collected-small-fixes branch Jun 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.