363 Commits

Author SHA1 Message Date
Greg Landrum
45bf58754a Cleanup some cmake dependencies (#3077)
* change minimal cmake version to a consistent 3.5

* progress towards a cleanup

* get the basic python deps working

* two more libs

* another round of changes
all tests pass at this point

* next round of changes
all tests pass at this point

* close to done
all tests pass

* very close

* almost done

* shift the RDBoost dependencies around a bit

* remove an extraneous python linkage
this is trying to get the mac builds working again

* Only link to python if it was built shared (#3091)

* change in response to review

Co-Authored-By: Ric <ricrogz@users.noreply.github.com>

* move that suppression of the maybe-uninitialized warning to BoostStartInclude.h

Co-authored-by: Brian Kelley <fustigator@gmail.com>
Co-authored-by: Ric <ricrogz@users.noreply.github.com>
2020-04-17 14:34:23 +02:00
Ric
cc8e21864b Update Maeparser & Coordgen Dependencies (#3011)
* update

* remove references to templates.mae
2020-03-17 13:50:57 +01:00
Greg Landrum
fcdf086ee5 A couple additions to the extended Hueckel integration (#2955)
* add reference input/output files for yaehmop

* orbital energies, overlap matrix, and hamiltonian on the C++ side

* add the python wrappers for the new functions
2020-02-24 10:32:02 +01:00
Greg Landrum
3851380800 Remove bogus URFLib library (#2900)
* a couple of URF building cleanups

* java wrapper build cleanups

* no longer need URF.cpp
2020-01-28 08:52:58 -05:00
Greg Landrum
d41752d558 run clang-tidy with readability-braces-around-statements (#2899)
* run clang-tidy with readability-braces-around-statements
clang-format the results
clean up all the parts that clang-tidy-8 broke

* fix problem on windows
2020-01-25 14:19:32 +01:00
Eisuke Kawashima
5cd27a242f Fix typo (#2862)
* Fix typo

* Reflect the comments

* Fix more typos
2019-12-31 06:43:27 +01:00
Greg Landrum
f9596813c9 Fixes the size of the reduced charge matrix from eHT calculations (#2864)
* Fix the shape of the reduced charge matrix

* Test reduced charge mat

* update python tests

* add numOrbitals, numElectrons to results structure
2019-12-27 07:24:23 -05:00
Eisuke Kawashima
7599b5fb14 Tidy Up (#2834)
* Replace obsolete `throw()` with `noexcept`

http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r4.html

* Avoid deprecated tempfile.mktemp

https://docs.python.org/3/library/tempfile.html#deprecated-functions-and-variables

* Fix "warning: control reaches end of non-void function"
2019-12-18 16:44:55 +01:00
Paolo Tosco
c01ccb5d85 Fix YAeHMOP build (#2838)
* - fix YAeHMOP build on Linux

* - fix YAeHMOP build on Windows
2019-12-11 06:06:05 +01:00
Paolo Tosco
1920b243e6 - enable building RDKitRingDecomposerLib.dll under Windows (#2742)
* - enable building RDKitRingDecomposerLib.dll under Windows

* make sure to export the dummy function or MSVC won't create the import library
2019-10-31 05:46:52 +01:00
Greg Landrum
5de8007b43 Merge branch 'e-kwsm-misc' 2019-10-25 04:49:23 +02:00
Greg Landrum
b62de7b03e Get zlib-free linking working on windows (#2729)
* fix zlib linking?

* this builds for me on windows. Does it work on azure devops?
2019-10-24 13:36:24 +02:00
Eisuke Kawashima
dc7cc84a0c Fix typo [ci skip] 2019-10-17 17:45:50 +09:00
Eisuke Kawashima
185ec927ab Unset executable flag 2019-10-10 20:18:43 +09:00
Ric
f5f9c50035 update coordgen (#2686) 2019-10-04 05:25:55 +02:00
Ric
b92c265348 update maeparser (#2682) 2019-10-03 17:15:07 +02:00
Ric
d458e46548 update (#2652) 2019-09-22 08:19:25 +02:00
Greg Landrum
e7eca3a8a0 first pass at switching to a normal download (#2609)
The ExternalProject thing is just more trouble than it is worth
2019-08-19 13:45:25 -04:00
Greg Landrum
dd21db1b06 Integrate Unique Ring Families from RingDecomposerLib (#2558)
* add the ring decomposer lib (temporarily?)

* simplify makefile

* very basics work

* backup

* 	basics working

* builds and basic tests pass

* get this building again

* expose the ring families

* add tests on the python side

* make the pywrapper for this optional

* remove some extra bits

* cleanup

* switch to using RDL as an external project

* make sure this still works if we do not use the URF code

* remove BUILD_ALWAYS

* fix linkage of Java wrapper and cartridge (hopefully)

* fix cmake for wrappers (hopefully)

* forgot a semicolon

* try to force URF lib to build first

* improve memory management and interface

* fix dependency specifier

* make pointer initialization explicit

This may not be necessary, but it feels safer.

* not pleasing and needs to be cleaned up
but it builds

* not pleasing and needs to be cleaned up
but it builds

* cleanup in preparation for merging

* cleanup in preparation for merging

* switch to rareylab repo

* fix updated copyright date

* Fix updated copyright date

* switch to a specific library tag

Co-Authored-By: Florian Flachsenberg <flachsenberg@zbh.uni-hamburg.de>

* change in response to review
2019-07-30 06:41:55 -04:00
Ric
ef1c744339 Update maeparser and coordgen versions (#2542)
* maeparser v1.2

* coordgen v1.3
2019-07-12 15:17:40 +02:00
Greg Landrum
7e6600f3be Fixes #2516 (#2519)
* RDStreams now installed properly

* skip Wrap directories if RDK_BUILD_PYTHON_WRAPPERS is not set

Fixes #2516
2019-06-28 09:57:00 -04:00
Greg Landrum
b2a01a09ee Add java builds to azure devops (#2460)
* add linux_java build

* trigger azure pipelines builds on dev/ branches

* make sure boost::iostreams gets linked in the SWIG wrappers

* updates to get static boost builds working on mac

* update linux a bit and add mac build

* forgot to save the mac file

* install version of boost with -fPIC

* try to force use of the boost installed in /usr

* typo

* add library hint

* diagnosing a failing build

* be explicit about CXX version

* try to force use of the system compilers

instead of the ones from conda

* stop using conda

* typp

* re-enable full build

* disable the appveyor builds
2019-05-22 15:31:42 +02:00
Greg Landrum
ec31bea97b clang-tidy-7 pass (#2408) 2019-04-16 12:05:47 -04:00
Paolo Tosco
42544b928b - enable building FreeSASA under Windows (#2402)
- enable setting probeRadius as SASAOpts
2019-04-15 12:55:20 +01:00
Greg Landrum
0eb983a09d WIP: optional integration with YAeHMOP (#2335)
* stub for YAeHMOP integration

* switch to using catch for the test

* first steps towards calling from rdkit

* switch to using some smart pointers

* runs, but has unpredictable seg faults. Needs valgrinding

* cleanup

* allow hacky linux builds too

* start using unique_ptrs for memory management

* don't find princ axes by default
Support probably isn't compiled in.

* save computed properties

* additional cleanup

* start working on a smarter way to get the code

* start making the cmake externalproject support work

* seems to work

* does not work yet

* this actually seems to build and work on linux

* theoretically more robust

* handle the parameter file

* first wrapper

* try to get mac builds working too

* initial pass at including reduced charge and overlap population matrices

* update docs

* backup commit

* switch to using cmake to handle the C++ spec

* switch to using a results object for the eHT calculations

* support fermi and total E
2019-03-24 08:07:50 +01:00
Ric
48c9532c6f update coordgen, fix ZLIB (#2355) 2019-03-18 04:41:25 +01:00
Greg Landrum
89439f5520 Expose RGroupDecomposition to SWIG (#2345)
* change to make the SWig builds work on windows

* add the wrapper. Still needs tests

* first rgd java wrapper test, does not pass

* get static builds working on windows
2019-03-13 08:23:23 -04:00
Ric
6224a42516 Build warnings revisited (#2318)
* unused vars in bison parser cleanup

* initialization order in TopologicalTorsionGenerator

* unused params in SLN bison

* sln flex unused params

* throwing destructor in TDTWriter

* signed comparison in substructmethods

* unused input param in smiles/smarts bison

* unused ms param in sln bison

* signed comparison in FingerprintGenerator

* store return of fscanf in StructCheckerOptions

* unreferenced var in catch

* uninitialized value in FileParserUtils

* avoid override overload warning in MolDraw2DSVG

* non-final overrides in Validate.h

* unused static var in Avalon

* unused vars in catch blocks

* make AvalonTools avalonSimilarityBits & avalonSSSBits const int

* assert fscanf result in StructCheckerOptions
2019-03-08 16:42:54 +01:00
Greg Landrum
b38ea06715 fix a problem caused by #2327 with local catch2 installs 2019-03-08 15:34:51 +01:00
Gianluca Sforna
86e4f964bc allow using system's catch2 for tests (#2327) 2019-03-08 14:18:22 +01:00
Greg Landrum
24f1737839 Remove a bunch of Python2-related warts (#2315)
* remove all of the "from __future__" imports

* remove the first batch of rdkit.six imports/uses

* next step of rdkit.six removal

* removing xrange, range, and some maps

* next round of removals

* next round of cleanups

* fix inchi test

* last bits of "from rdkit.six" are gone

* and the last of the six stuff is gone

* strange importlib problem
2019-03-06 20:43:49 -05:00
Ric
a611e7f917 Update maeparser & coordgen libraries (#2302)
* update maeparser & coordgen

* fix iostreams linking

* add shared_ptr constructor
2019-03-06 08:26:39 +01:00
Riccardo Vianello
c19ebb9c56 don't use a ctab as input for the computation of 2D coordinates (#2255)
* don't use a ctab as input for the computation of 2D coordinates

Fix GitHub issue 1062.

* make sure that the output 2D coordinates are ordered correctly
2019-02-25 12:39:01 -05:00
Greg Landrum
bebf0c9002 Allow converting mol blocks directly to InChI (#2262)
* basics of enabling molblock -> InChI

* first pass at python wrapper

* test that options work
2019-02-13 09:43:02 -05:00
Ric
3cc9206a48 Update build rules for coorgen & maeparser (#2184) 2019-01-06 06:28:00 +00:00
Ric
a6b26253ff Fix (most of) mem problems (#2123)
* do not use new on loggers

* del pointers in testDistGeom

* Update Dict hasNonPOD status on bulk update

* delete new Dicts in memtest1.cpp

* fixes in MolSuppliers and testFMCS

* PeriodicTable singleton as unique_ptr

* fix EEM_arrays leak

* fix leaks in testPBF

* fix ParamCollection leak in test UFF

* fix leaks in MMFF

* clear prop dict before read in in pickler

* fix leaks in testFreeSASA

* fix leaks in test3D

* modernize Dict.h & SmilesParse.cpp

* fix leaks in testQuery

* fix leaks in testCrystalFF

* fix leaks in cxsmilesTest

* fix leaks in Catalog & mol cat test

* fix leaks in ShapeUtils & tests

* fix leaks in testSubgraphs1

* fix leaks testFingerprintGenerators

* fix leaks in Catalog/FilterCatalog

* fix leaks in graphmolqueryTest

* these changes reduce bison parse leaks

* fixed leaks in testChirality.cpp

* fix leaks + 2 tests in testMolWriter

* fix 4m leaks in substructLibraryTest

* small improvements to molTautomerTest; still leaks

* fix leaks in testRGroupDecomp

* fix leaks in test; parser still leaks

* fix leaks in itertest

* fix 4m leaks in testDepictor

* fixes in smatest; still leaking due to parser

* fixes in testSLNParse; still leaking due to parser

* flex/bison: always add atoms with ownership; smarts error cleanup

* fix leaks in testReaction

* fix leaks in testSubstructMatch

* fix leaks in resMolSupplierTest

* fix leaks in testChemTransforms + bug in ChemTransforms

* fix leaks in testPickler

* fix leaks in testMolTransform

* fix leaks in testFragCatalog

* fix leak in testSLNParse. Still leaks due to Smiles

* fixed most leaks in testMolSupplier

* pre bison fix

* fix some atom & bond parse problems; others still fail

* bison smiles & smarts, atoms & bonds more or less fixed

* fix leaks in molopstest.cpp

* fix leaks in testFingerprints, MACCS.cpp & AtomPairs.cpp

* fix leaks in moldraw2Dtest1

* fix leaks in testDescriptors

* fix leaks in testInchi

* fix leaks in testUFFForceFieldHelpers

* fix leaks in hanoiTest & new_canon.h

* fix leaks in testMMFFForceField

* fix leaks in graphmolTest1

* fix leaks in testMMFFForceFieldHelpers

* fix leaks in testDistGeomHelpers

* fix leaks in testMolAlign

* initialize occupancy & temp facto with default values

* fix leak in TautomerTransform

* updated suppressions

* fix testStructChecker

* fix logging & py tests

* fix TautomerTransform class/struct issue

* remove misplaced delete in testSLNParse

* deinit in testAvalonLib1

* fix Avalon-triggered(?) bug in StructChecker/Pattern.cpp

* fix random testMolWriter/Supplier fails

- diversify output file names to avoid clashing.
- unify Writers close/destruct behavior.
- flushing/closing in tests.

* use reset in FFs Params.cpp

* comments on testMMFFForceField

* unrequired 'if's added to mol suppliers

* correct cast in FilterCatalog.h

* use unique_ptr in MACCS Patterns

* remove unrequred if in new_canon

* update & move suppressions
2018-10-29 14:33:26 +00:00
Greg Landrum
66fc8ba0d6 switch the catch2 handling to a normal download (#2127)
* switch the catch2 handling to a normal download
the externalproject thing was not actually working on windows

* fix the includes

* <sigh>

* try switching back to normal include_directories

* push the define up to the parent scope
2018-10-22 04:22:36 +02:00
Paolo Tosco
f7c888844d moved test.h from RDBoost to RDGeneral for consistency with export.h (#2074) 2018-10-11 17:35:23 -04:00
Greg Landrum
fd3719acc5 Stop printing Templates location (#2102)
This should not have been in the release in the first place
2018-10-11 06:13:12 -04:00
Greg Landrum
32a19eaae9 Fixes #1786 (#2090) 2018-10-04 08:30:56 -04:00
Brian Cole
a453b8510a Expose a CMake flag to build RDKit with -rpath (#2084)
* Adding the RDK_BUILD_RPATH_SUPPORT build flag to specify that RDKit
should link its shared libraries using -rpath. This allows the C++
shared libraries to be loaded from python without needing
LD_LIBRARY_PATH to be set.

This assumes the user has specified CMAKE_INSTALL_PREFIX to be the
place the RDKit will be installed to as this will use absolute paths
with -rpath. More work will need to be done by any user wishing to
make rpath work with relative paths from $ORIGIN.

* Allow the catch source code to be populated directly by un-taring the source code into the proper location.
2018-10-04 04:42:53 +02:00
Greg Landrum
1b562a0f82 switch to v1.0.1 of the maeparser (#2048) 2018-09-18 05:29:32 +02:00
Greg Landrum
2966c9d745 patch a memory allocation problem in the maeparser v1.0.0 (#2044) 2018-09-17 15:31:12 +02:00
Greg Landrum
223513a76e Start to use Catch2 for new tests (#1732)
* backup

* build works

* works

* builds on linux

* rename the test

* add another test to make sure that works
2018-09-04 10:32:17 -04:00
Greg Landrum
2738c35178 Fixes #1903 (#1971)
* Fixes #1903

* update SWIG bindings too
2018-07-25 09:14:17 +02:00
Greg Landrum
d54f798b56 Fixes #1929 (#1934)
* Fixes #1929

* add a tests to make sure bogus template directories work
2018-06-29 11:06:00 -04:00
Paolo Tosco
45499c7bca - allows coordgen and maeparser to be built as static libraries (#1909) 2018-06-14 05:43:59 +02:00
Greg Landrum
6c888779a0 Fixes #1887 (#1895)
* add tagged release of coordgenlibs

* lock to v1.0.0 of maeparser
2018-06-09 05:43:08 +02:00
Greg Landrum
77078eac66 Add an auto-populated file with cmake config options (#1874)
* this is a rough first pass, needs to be finished and is a strong argument for changing the names of some of the #defines that are currently used

* rationalize the rest of the #defines
add something to the release notes about this
2018-06-09 05:41:28 +02:00
Paolo Tosco
97d147b3f1 - fixes the dynamic/static library CMake logic (#1875) 2018-05-27 07:13:03 +02:00