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

ENH: Remove lua bindings #37

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ dependencies:
# - lua-luafilesystem
- luarocks
# Pinned
- fmt==9.1.0
- eigen==3.4.0
- lua==5.3.*
33 changes: 20 additions & 13 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -45,30 +45,37 @@ _deps += m_dep
_deps += [declare_dependency(link_args: '-lstdc++')]

# All of which can be installed with meson wrap install <blah> originally
eigen_dep = dependency('eigen3',
version: '3.4.0',
required: true)
eigen_dep = subproject('eigen', default_options: ['default_library=static']).get_variable('eigen_dep')
_deps += [ eigen_dep ]

fmt_dep = dependency('fmt',
version: '9.1.0',
required: true)
_deps += [ fmt_dep ]
fmt_subproj = subproject('fmt', default_options: ['default_library=static'])
_deps += fmt_subproj.get_variable('fmt_dep')

cmake = import('cmake')
optv_cppyaml = cmake.subproject_options()
optv_cppyaml.add_cmake_defines(
{
'CMAKE_BUILD_TYPE': 'Release',
'YAML_BUILD_SHARED_LIBS': 'OFF',
'CMAKE_POSITION_INDEPENDENT_CODE': true,
'CMAKE_CXX_FLAGS': '-w',
'CMAKE_C_FLAGS': '-w',
},
)
cmcppyaml = cmake.subproject('yaml-cpp', options: optv_cppyaml)
_deps += cmcppyaml.dependency('yaml-cpp')


boost_dep = dependency('boost',
modules : [
'filesystem',
'system',
],
required : false,
static : true,
)
_deps += [ boost_dep ]

libyamlcpp_dep = dependency('yaml-cpp',
fallback: ['yaml-cpp',
'libyamlcpp_dep'])
_deps += [ libyamlcpp_dep ]

# Include Sources

_incdirs += include_directories([ 'src/include/internal',
Expand All @@ -78,7 +85,6 @@ _incdirs += include_directories([ 'src/include/internal',

ydsl_sources = [
'src/absOrientation.cpp',
'src/backward.cpp',
'src/bond.cpp',
'src/bop.cpp',
'src/bulkTUM.cpp',
Expand All @@ -93,6 +99,7 @@ ydsl_sources = [
'src/rdf2d.cpp',
'src/ring.cpp',
'src/seams_input.cpp',
'src/selection.cpp',
'src/seams_output.cpp',
'src/selection.cpp',
'src/shapeMatch.cpp',
Expand Down
4 changes: 1 addition & 3 deletions src/bond.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,6 @@ bond::populateHbonds(std::string filename,
//
std::vector<std::vector<int>>
hBondNet; // Output vector of vectors containing the HBN
molSys::PointCloud<molSys::Point<double>, double>
hCloud; // point Cloud for the hydrogen atoms
std::vector<std::vector<int>>
molIDlist; // Vector of vectors; first element is the molID, and the next
// two elements are the hydrogen atom indices
Expand All @@ -202,7 +200,7 @@ bond::populateHbonds(std::string filename,

// --------------------
// Get all the hydrogen atoms in the frame (no slice)
hCloud = sinp::readLammpsTrjreduced(filename, targetFrame, &hCloud, Htype);
auto hCloud = sinp::readLammpsTrjreduced(filename, targetFrame, Htype); // point Cloud for the hydrogen atoms

// Get the unordered map of the oxygen atom IDs (keys) and the molecular IDs
// (values)
Expand Down
234 changes: 0 additions & 234 deletions src/include/external/fmt/args.h

This file was deleted.

Loading
Loading