Commit Graph

212 Commits

Author SHA1 Message Date
Greg Landrum
47bcff20a1 Fixes 1916 (#2093)
* backup commit

* finish adding reaction_to_svg()
Fixes #1916
2018-10-08 22:28:29 +02:00
Pavel Raiskup
d4a17f94d2 PgSQL: add support for PostgreSQL_CONFIG cmake var (#2014)
This is useful for installations where pg_config is renamed to not
collide with the system default pg_config name.

We should drop 'find_package(PostgreSQL REQUIRED)' statement in
future because that's supposed to find PostgreSQL client library
to build against, not PostgreSQL server.  It might happen that
PostgreSQL server on the system is of different version than libpq
(Debian), but in future it will be problematic also on Fedora
(rhbz#1618698).

See also: https://gitlab.kitware.com/cmake/cmake/issues/17223
2018-10-07 05:00:19 +02:00
Greg Landrum
2f6c62ee59 update expected cartridge regression results
should have been part of #1997
2018-08-16 05:22:39 +02:00
Greg Landrum
81025953fc these should have been updated as part of #1940 (#1981) 2018-07-30 11:21:51 +02:00
Greg Landrum
2738c35178 Fixes #1903 (#1971)
* Fixes #1903

* update SWIG bindings too
2018-07-25 09:14:17 +02:00
Greg Landrum
3ff4316f05 Fixes #1886 (#1890)
* mark most cartridge functions as parallel safe

* version bumps
2018-06-17 13:33:56 +01: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
greg landrum
c75ac4fad5 update expected results from psql tests (connected to #1866) 2018-05-25 08:18:16 +02:00
Paolo Tosco
c08ea49bda - enable building DLLs on Windows (#1861)
* - enable building DLLs on Windows

* - export.h and test.h are now auto-generated by CMake
2018-05-16 08:42:41 +02:00
Matt Swain
a6354d1501 Make svg xmlns prefix use more consistent (#1866)
Set svg as the default xmlns, so no prefix is needed for every svg tag. Also remove all code in python wrappers that stripped these prefixes.
2018-05-14 17:07:55 +02:00
Greg Landrum
26f1f4cf01 builds on ubuntu 18.04 (#1858) 2018-05-10 05:04:39 +02:00
Greg Landrum
a7be90a2ae fix a problem with the cartridge tests caused by coordgen not being the default 2018-02-19 17:09:32 +01:00
Greg Landrum
42eecc664d Integrate Coordgen (#1708)
* first pass, does not yet actually work

* pass2, same problems

* pass2, same problems

* another test

* new tests; bugfix

* move the code out to a header

* add a double bond example

* enable auto-downloads of the code

* move the function to its own namespace

* first pass at a basic python wrapper

* change coordgen commit used

* try supporting bond stereo; does not currently work

* cis/trans seems to now work.

* first pass at templates; needs testing

* use the fixed flag too

* need mol align

* expand test

* initial pass at python wrapper for template

* simplify tests

* add an option to directly use a substructure match for alignment

* scaling

* add #define

* Define a cache setting for RDK_COORDGEN_LIBS to allow these to be used in other packages

* return the conformer id from addCoords

* Make CoordGen the default when it’s available.
This is a backup commit… the tests don’t even come close to passing.

* add some debugging options for a bit

* add alignment step to testing when using non-fixed coords

* Add global to allow use of CoordGen to be disabled
get the basic depictor tests working

* make coordgen the default when it is available

* make sure things continue to work when coordgen is disabled

* get windows builds working

* mods to get this building on windows.
something is screwy with the fileParsersTest1

* no need to generate coords for the 1K C string

* fix java wrappers

* works on linux

* update the (stupid) way dependencies were handled on windows.
this allows a lot of cleanup of cmake files (still more to do)
the linux build is unlikely to work due to the way _statics aren't handled

* docs

* extend forceRDKit applicability

* switch coordgen version

* try using templates

* try to get the template dir finding reasonably robust w.r.t. conda install

* continuing to iterate on the way the template file is installed

* fix a problem caused by the merge

* remove test that should never have been checked in

* update expected results for cartridge tests

* switch back to using the RDKit as the default coordinate generator
2018-02-15 05:36:03 +01:00
Paolo Tosco
2c86fbb2ec - updated the PgSQL README (#1722) 2018-01-31 08:00:40 +01:00
Paolo Tosco
fedd735d1a - cosmetic fix of an indentation (#1717)
- added dependency from Boost include files to COde/PgSQL/rdkit/CMakeLists.txt to allow conda rdkit-postgresql95 build
2018-01-21 07:16:54 +01:00
Greg Landrum
d15efc1ac9 Make the defaults for some functions less error prone. (#1690)
* auto generate coords in mol block writer if includeChirality = True

* default to include chirality when writing mol blocks/files

* make isomeric smiles the default; note that not all tests are passing at the moment

* update a reaction test

* update expected cartridge search results
at this point all python, c++, and cartridge tests pass

* docs

* update incompatibility docs

* update doctests

* these now build

* minor example update

* update expected c++

* typo

* make allowCXSMILES=true the default

* add auto perception of chirality when reading 3D structures from mol blocks

* explain changes in release notes

* further doc update
2017-12-22 08:09:36 -05:00
Greg Landrum
1efa8e696e another clang-format run 2017-10-12 06:42:15 +02:00
Greg Landrum
f94e277856 another pass of clang modernize 2017-10-12 06:35:51 +02:00
Greg Landrum
db89172bf8 handle the heavy-atom degree queries differently (#1560)
* handle the heavy-atom degree queries differently

* Fixes #1563

* add a test for the heavy atom degree option

* Support (and test) adjustHeavyDegree in the cartridge too.

* test results
2017-09-12 16:10:15 -04:00
Greg Landrum
3ddb54aeef Fix #1496 (#1517)
* switch from using `[D0]` to `[*]` to ensure single atom fragments are correctly handled in the pattern fingerprint;
Fixes #1496

* update expected reaction similarity results
2017-08-15 13:00:30 -04:00
Paolo Tosco
eec17536fb - fixes PgSQL CMakeLists.txt to enable conda build on Windows (#1457) 2017-06-29 20:31:41 +02:00
Greg Landrum
3a557df24b modify pattern fp order; update expected psql results (#1399)
* move the new pattern to the end of the list so that existing bit definitions stay constant

* update expected results for psql tests
2017-04-19 11:57:48 -04:00
Greg Landrum
c904791f26 fix compatibility with PostgreSQL 9.2 (#1189)
* fix compatibility with PostgreSQL 9.2

* get tests working on pgsql92; the Makefile does not currently work

* simplify 9.2 handling

* seems to work on 9.6 and 9.2 now
2016-12-05 14:31:42 +01:00
Riccardo Vianello
85ef5d1c2d add missing $RDKLIBS 2016-11-13 21:30:18 +01:00
Greg Landrum
5943f064f0 additional AdjustQueryParameters options for cartridge 2016-11-06 09:41:48 +01:00
Greg Landrum
1b946794f0 replaceBond and generic atoms and bonds in adjustQueryProperties() (#1141)
* first pass at RWMol::replaceBond()

* get ready for the changes

* rename some options
add bond options (not doing anything with them yet)
update tests to reflect new options

* backup

* re-enable the rest of the tests
2016-11-04 12:41:06 +01:00
Greg Landrum
dc7c9b6f31 Provide SVG output from the cartridge (#1109)
* a bit of header cleanup

* Fixes #1106

* First pass, basics.
Still need tests and handling of parameters.

* initial pass at including JSON parsing of options (not complete)

* handle errors while parsing json instead of just crashing the server

* updated (and working) JSON configuration

* first drawing tests

* document the new function

* it helps to save before committing
2016-10-21 17:05:59 -04:00
Riccardo Vianello
dbe694bbee fix compatibility issues with postgres < 9.5 (#1000) (#1005)
* fix compatibility issues with postgres < 9.5 (#1000)

* smaller fixes related to PgSQL version requirements
2016-08-09 04:58:45 +02:00
Paolo Tosco
5d3bb11488 Fix Inchi being hardcoded into PostgreSQL (#1009)
* - this should fix the problem with "Inchi" being hardcoded into PostgreSQL

* - moved the InChI check code out of the main CMakeLists.txt
  into FindInchi.cmake
2016-08-08 11:22:56 +02:00
Paolo Tosco
41d415a495 - fixes typo which breaks the PostgreSQL cartridge build on Windows (#1008) 2016-08-05 05:02:52 +02:00
Greg Landrum
b9fbd0be80 fix a cartridge test broken by #986 2016-08-01 07:41:00 +02:00
Riccardo Vianello
b0bba544d5 refactoring of the postgresql cartridge (#992)
* refactored Bfp indexing and similarity search

* update CMakeLists.txt

* catch (and fix) inconsistent options around building static libs

* differentiate the data structures in inner and leaf pages

* code cleanup and some additional comments

* version bump

* fix renaming of cache function

* minor cleanup

* add -DUSE_BUILTIN_POPCOUNT to ${POPCOUNTFLAGS}
2016-08-01 07:30:03 +02:00
Paolo Tosco
aa763c4cfc - fixed a few slashes in a Linux path (#997)
- added some information how to run PgSQL ctest
2016-07-29 14:07:09 +02:00
Greg Landrum
7ef4b028c0 Fixes #987 (#988) 2016-07-26 13:20:10 -04:00
Gianluca Sforna
5106eb8d3e Fix format-security GCC warning (#984)
In Fedora land, format-security GCC warnings are treated as errors
so the build would fail like this:

In file included from /usr/include/pgsql/server/postgres.h:48:0,
                 from rdkit.h:40,
                 from mol_op.c:33:
mol_op.c:339:19: error: format not a string literal and no format arguments [-Werror=format-security]
     elog(WARNING, t);
                   ^
2016-07-24 15:59:01 +02:00
Paolo Tosco
f0701b7811 - fixes built-in popcount in PgSQL cartridge on Windows (#978) 2016-07-20 22:52:21 -04:00
Greg Landrum
d9d4fbb9a8 typo fix
<sigh>
2016-06-22 17:52:20 +02:00
Greg Landrum
4997acdda8 Ensure the cartridge uses POPCOUNT when built with cmake
The problem only affected cmake cartridge builds.
2016-06-22 16:54:23 +02:00
Greg Landrum
d63f44cc0c Add cartridge support for adjustQueryProperties() (#949)
* backup commit

* Change the names and meanings of MolOps::AdjustQueryWhichFlags
What was there before was not flexible enough and was extremely confusing. This should clear that up.

NOTE: this does break backwards compatibility with code that uses this enum, but given that this is new and has not been
widely promoted, I suspect it should not affect that many people. The default behavior of MolOps::adjustQueryProperties()
remains the same.

* adjust to the new AdjustQueryWhichFlags

* add mol_adjust_query_properties tests to the cartridge
2016-06-21 14:38:32 -04:00
Greg Landrum
a9186f6af9 Fixes #920 2016-05-20 13:20:47 +02:00
Greg Landrum
ffe829d5da adjust cartridge tests after the fix for #874 (#884) 2016-04-25 14:19:01 -04:00
Paolo Tosco
735052d267 - fixed a few typos in Code/PgSQL/rdkit/CMakeLists.txt 2016-04-19 17:09:54 +01:00
Paolo Tosco
5b7b56ce1f - PostgreSQL cartridge install commands are now echoed on Linux and OS X 2016-04-09 18:05:30 +01:00
Paolo Tosco
90287fd76f - correction in Code/PgSQL/rdkit/README 2016-04-09 17:35:21 +01:00
Paolo Tosco
d27179a115 - added some instructions to help finding PostgreSQL under RHEL/CentOS
using the PostgreSQL RPMs provided by the PostgreSQL RPM Building Project
2016-04-09 11:53:59 +01:00
Paolo Tosco
8135eb0396 - Updated Install.md and README files related to the new CMake build
procedures involving the Avalon Toolkit, InChI and PostgreSQL cartridge
2016-04-03 23:06:28 +01:00
Paolo Tosco
95ad08f934 - added a PGDLLEXPORT to _PG_init(void) to avoid "unrecognized
configuration parameter" errors on Windows with PostgreSQL 9.1
- added a dummy RDKit cartridge function call at the beginning of the
  reaction.sql test to avoid "unrecognized configuration parameter" errors
  with PostgreSQL 9.1
- modified reaction.out to reflect the change in reaction.sql
2016-03-31 22:04:42 +01:00
Paolo Tosco
1caedd96b5 - added a fix for earlier version of PostgreSQL on Windows in
CMakeLists.txt
- fixed a bug in Code/PgSQL/rdkit/rdkit_gist.c which did not cause
  issues with PostgreSQL 9.5 on Windows, but does with earlier PostgreSQL
  versions
- removed an unnecessary conditional compilation clause from
  Code/PgSQL/rdkit/rdkit.h as PostgreSQL 8.x is not supported anymore
2016-03-30 19:28:11 +01:00
Paolo Tosco
8e2009bd36 - added support for different PostgreSQL version with regard to the
--psqldir switch
2016-03-24 22:57:17 +00:00