Commit Graph

192 Commits

Author SHA1 Message Date
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
Paolo Tosco
016c6482af - fixed the PostgreSQL CMake build on OS X 2016-02-25 23:21:37 +00:00
Paolo Tosco
8266f37529 - added support for building the rdkit PostgreSQL cartridge within CMake 2016-02-21 22:00:10 +00:00
Paolo Tosco
972d9db325 - updated the PostgreSQL rdkit cartridge README 2016-02-21 21:57:23 +00:00
Paolo Tosco
cf8180e435 - added PGDLLEXPORT to allow exporting the relevant symbols in the Windows
rdkit.dll PostgreSQL cartridge DLL
2016-02-21 21:38:13 +00:00
Greg Landrum
dab873fc4d support providing InChI (or InChI key) generation options in cartridge 2016-02-06 05:50:23 +01:00
Greg Landrum
0015f853ac systematize use of popcnt 2016-01-12 12:09:53 +01:00
Greg Landrum
6bd2c20ac0 all tests pass 2016-01-12 12:09:53 +01:00
Greg Landrum
e08e0d16d8 first pass, using google style 2015-11-14 14:58:11 +01:00
Greg Landrum
20efe4f061 fix multithread build 2015-11-06 07:12:10 +01:00
Greg Landrum
d30cb9a19b Fixes #428 2015-10-28 06:23:45 +01:00
Greg Landrum
f360fcd12b remove some extraneous stuff 2015-10-28 06:04:42 +01:00
Greg Landrum
1692914b6e Fixes #525 2015-10-28 06:01:46 +01:00
Greg Landrum
c924b36c9a Merge branch 'master' into Issue525 2015-10-28 03:19:17 +01:00
Greg Landrum
d905e07f20 support new descrs in cartridge 2015-09-21 16:31:36 +02:00
Greg Landrum
65144fbf3c disable the last of the debugging output 2015-06-30 02:48:12 +02:00
Greg Landrum
58402d063c disable the last of the debugging output 2015-06-30 02:46:13 +02:00
Greg Landrum
a43492a195 way too much debugging output still in here, but this might be close to a solution 2015-06-27 07:49:50 +02:00
Greg Landrum
49f55e76ed add test for the issue 2015-06-23 07:01:16 +02:00
Greg Landrum
1b195e0146 Fixes #499 2015-05-03 08:53:27 +02:00
Greg Landrum
2904be0833 add warnings for timeouts 2015-04-18 07:09:59 +02:00