Changeset: 57639db3a18f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57639db3a18f Removed Files: debian/libmonetdb5-server-gsl.install sql/backends/monet5/gsl/46_gsl.sql sql/backends/monet5/gsl/73_gsl.mal sql/backends/monet5/gsl/Makefile.ag sql/backends/monet5/gsl/Tests/All sql/backends/monet5/gsl/Tests/gsl00.malC sql/backends/monet5/gsl/Tests/gsl00.stable.err sql/backends/monet5/gsl/Tests/gsl00.stable.out sql/backends/monet5/gsl/Tests/gsl01.sql sql/backends/monet5/gsl/Tests/gsl01.stable.err sql/backends/monet5/gsl/Tests/gsl01.stable.out sql/backends/monet5/gsl/gsl.c sql/backends/monet5/gsl/gsl.mal Modified Files: MonetDB.spec NT/rules.msc clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 configure.ag debian/control sql/backends/monet5/Makefile.ag sql/test/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/All sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/All sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/All sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 testing/Mtest.py.in Branch: default Log Message:
Removed GSL module: it's now a separate (extension) package. See http://dev.monetdb.org/hg/MonetDB-gsl/. diffs (truncated from 2299 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -140,7 +140,6 @@ BuildRequires: gcc %if %{?with_geos:1}%{!?with_geos:0} BuildRequires: geos-devel >= 3.4.0 %endif -BuildRequires: gsl-devel %if %{?with_lidar:1}%{!?with_lidar:0} BuildRequires: liblas-devel >= 1.8.0 BuildRequires: gdal-devel @@ -468,27 +467,6 @@ This package contains support for readin %{_libdir}/monetdb5/lib_lidar.so %endif -%package gsl-MonetDB5 -Summary: MonetDB5 SQL interface to the gsl library -Group: Applications/Databases -Requires: MonetDB5-server%{?_isa} = %{version}-%{release} - -%description gsl-MonetDB5 -MonetDB is a database management system that is developed from a -main-memory perspective with use of a fully decomposed storage model, -automatic index management, extensibility of data types and search -accelerators. It also has an SQL frontend. - -This package contains the interface to the GNU Scientific Library for -numerical analysis (gsl). - -%files gsl-MonetDB5 -%defattr(-,root,root) -%{_libdir}/monetdb5/autoload/*_gsl.mal -%{_libdir}/monetdb5/createdb/*_gsl.sql -%{_libdir}/monetdb5/gsl.mal -%{_libdir}/monetdb5/lib_gsl.so - %if %{?with_samtools:1}%{!?with_samtools:0} %package bam-MonetDB5 Summary: MonetDB5 SQL interface to the bam library @@ -647,7 +625,6 @@ fi %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/geom.mal %endif -%exclude %{_libdir}/monetdb5/gsl.mal %if %{?with_lidar:1}%{!?with_lidar:0} %exclude %{_libdir}/monetdb5/lidar.mal %endif @@ -666,7 +643,6 @@ fi %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/autoload/*_geom.mal %endif -%exclude %{_libdir}/monetdb5/autoload/*_gsl.mal %if %{?with_lidar:1}%{!?with_lidar:0} %exclude %{_libdir}/monetdb5/autoload/*_lidar.mal %endif @@ -681,7 +657,6 @@ fi %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/lib_geom.so %endif -%exclude %{_libdir}/monetdb5/lib_gsl.so %if %{?with_lidar:1}%{!?with_lidar:0} %exclude %{_libdir}/monetdb5/lib_lidar.so %endif @@ -800,7 +775,6 @@ systemd-tmpfiles --create %{_sysconfdir} %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/createdb/*_geom.sql %endif -%exclude %{_libdir}/monetdb5/createdb/*_gsl.sql %if %{?with_lidar:1}%{!?with_lidar:0} %exclude %{_libdir}/monetdb5/createdb/*_lidar.sql %endif @@ -904,7 +878,6 @@ developer, but if you do want to test, t --enable-fits=%{?with_fits:yes}%{!?with_fits:no} \ --enable-gdk=yes \ --enable-geom=%{?with_geos:yes}%{!?with_geos:no} \ - --enable-gsl=yes \ --enable-instrument=no \ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \ --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \ diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -311,11 +311,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_GEOM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_GSL - $(ECHO) HAVE_GSL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_GSL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_HGE $(ECHO) HAVE_HGE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,3 +1,3 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures +HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures MERCURIAL?malcheck diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -6014,9 +6014,6 @@ Ready. [ "batgeom", "coordinateFromWKB", "command batgeom.coordinateFromWKB(X_0:bat[:wkb], X_1:int):bat[:dbl] ", "wkbCoordinateFromWKB_bat;", "returns xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided geometry" ] [ "batgeom", "mbr", "command batgeom.mbr(X_0:bat[:wkb]):bat[:mbr] ", "wkbMBR_bat;", "Creates the mbr for the given wkb." ] [ "batgeom", "setSRID", "command batgeom.setSRID(w:bat[:wkb], srid:int):bat[:wkb] ", "wkbSetSRID_bat;", "Sets the Reference System ID for this Geometry." ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:bat[:dbl], i:bat[:dbl]):bat[:dbl] ", "GSLbat_chisqProb_bat;", "Chi Squared probability" ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:bat[:dbl], i:dbl):bat[:dbl] ", "GSLbat_chisqProb_cst;", "Chi Squared probability" ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:dbl, i:bat[:dbl]):bat[:dbl] ", "GSLcst_chisqProb_bat;", "Chi Squared probability" ] [ "batmal", "multiplex", "pattern batmal.multiplex(mod:str, fcn:str, a:any...):any... ", "MANIFOLDremapMultiplex;", "" ] [ "batmkey", "hash", "command batmkey.hash(b:bat[:any_1]):bat[:lng] ", "MKEYbathash;", "calculate a hash value" ] [ "batmmath", "acos", "command batmmath.acos(x:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_dbl_acos;", "" ] @@ -7701,7 +7698,6 @@ Ready. [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], s:bat[:oid], g:bat[:oid]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup3;", "" ] [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup4;", "" ] [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], s:bat[:oid], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup5;", "" ] -[ "gsl", "chi2prob", "command gsl.chi2prob(d:dbl, i:dbl):dbl ", "GSLchisqProb;", "Chi Squared probability" ] [ "identifier", "#fromstr", "command identifier.#fromstr():void ", "IDfromString;", "Convert a string to an identifier without any check" ] [ "identifier", "#tostr", "command identifier.#tostr():void ", "IDtoString;", "Convert identifier to string equivalent" ] [ "identifier", "identifier", "command identifier.identifier(s:str):identifier ", "IDentifier;", "Cast a string to an identifer " ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -7980,9 +7980,6 @@ Ready. [ "batgeom", "coordinateFromWKB", "command batgeom.coordinateFromWKB(X_0:bat[:wkb], X_1:int):bat[:dbl] ", "wkbCoordinateFromWKB_bat;", "returns xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided geometry" ] [ "batgeom", "mbr", "command batgeom.mbr(X_0:bat[:wkb]):bat[:mbr] ", "wkbMBR_bat;", "Creates the mbr for the given wkb." ] [ "batgeom", "setSRID", "command batgeom.setSRID(w:bat[:wkb], srid:int):bat[:wkb] ", "wkbSetSRID_bat;", "Sets the Reference System ID for this Geometry." ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:bat[:dbl], i:bat[:dbl]):bat[:dbl] ", "GSLbat_chisqProb_bat;", "Chi Squared probability" ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:bat[:dbl], i:dbl):bat[:dbl] ", "GSLbat_chisqProb_cst;", "Chi Squared probability" ] -[ "batgsl", "chi2prob", "command batgsl.chi2prob(d:dbl, i:bat[:dbl]):bat[:dbl] ", "GSLcst_chisqProb_bat;", "Chi Squared probability" ] [ "batmal", "multiplex", "pattern batmal.multiplex(mod:str, fcn:str, a:any...):any... ", "MANIFOLDremapMultiplex;", "" ] [ "batmkey", "hash", "command batmkey.hash(b:bat[:any_1]):bat[:lng] ", "MKEYbathash;", "calculate a hash value" ] [ "batmmath", "acos", "command batmmath.acos(x:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_dbl_acos;", "" ] @@ -10057,7 +10054,6 @@ Ready. [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], s:bat[:oid], g:bat[:oid]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup3;", "" ] [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup4;", "" ] [ "group", "subgroupdone", "command group.subgroupdone(b:bat[:any_1], s:bat[:oid], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], histo:bat[:lng]) ", "GRPsubgroup5;", "" ] -[ "gsl", "chi2prob", "command gsl.chi2prob(d:dbl, i:dbl):dbl ", "GSLchisqProb;", "Chi Squared probability" ] [ "identifier", "#fromstr", "command identifier.#fromstr():void ", "IDfromString;", "Convert a string to an identifier without any check" ] [ "identifier", "#tostr", "command identifier.#tostr():void ", "IDtoString;", "Convert identifier to string equivalent" ] [ "identifier", "identifier", "command identifier.identifier(s:str):identifier ", "IDentifier;", "Cast a string to an identifer " ] diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -258,13 +258,6 @@ AS_CASE([$enable_geom-$have_shp], have_shp=no disable_shp="(ESRI Shapefile vault requires the geom module)"]) -dft_gsl=auto -AC_ARG_ENABLE([gsl], - [AS_HELP_STRING([--enable-gsl], - [enable support for GSL (default=auto)])], - [enable_gsl=$enableval], - [enable_gsl=$dft_gsl]) - dft_embedded=no AC_ARG_ENABLE([embedded], [AS_HELP_STRING([--enable-embedded], @@ -2354,17 +2347,6 @@ AS_VAR_IF([have_atomic_ops], [yes], [ CFLAGS="$CFLAGS $atomic_ops_CFLAGS" LIBS="$LIBS $atomic_ops_LIBS"])])]) -# Check for gsl library for statistical functions -org_have_gsl=no -have_gsl=$org_have_gsl -AS_VAR_IF([enable_gsl], [no], [], [ - PKG_CHECK_MODULES([gsl], [gsl], - [have_gsl=yes], - [have_gsl=no; why_have_gsl="(gsl library not found)" - AS_VAR_IF([enable_gsl], [yes], [AC_MSG_ERROR([gsl library required for GSL support])]) - enable_gsl=no; disable_gsl="(gsl library not found)"])]) -AM_CONDITIONAL([HAVE_GSL], [test x"$have_gsl" != xno]) - # checks for header files AC_HEADER_STDBOOL AC_HEADER_STDC @@ -3071,7 +3053,6 @@ for comp in \ 'fits ' \ 'getaddrinfo ' \ 'gdal ' \ - 'gsl ' \ 'liblas ' \ 'liblzma ' \ 'libxml2 ' \ diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Vcs-Browser: http://dev.monetdb.org/hg/M Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/ Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), - libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev, + libpcre3-dev, libreadline-dev, liblzma-dev, libssl-dev, libxml2-dev, pkg-config, python, python-dev, python-numpy, unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base Standards-Version: 3.8.0 @@ -176,20 +176,6 @@ Description: MonetDB5 SQL GIS support mo . This package contains support for reading and writing LiDAR data. -Package: libmonetdb5-server-gsl -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - monetdb5-sql (= ${source:Version}) -Description: MonetDB5 SQL interface to the gsl library - MonetDB is a database management system that is developed from a - main-memory perspective with use of a fully decomposed storage model, - automatic index management, extensibility of data types and search - accelerators. It also has an SQL frontend. - . - This package contains the interface to the GNU Scientific Library for - numerical analysis (gsl). - Package: libmonetdb5-server-bam Section: libs Architecture: any diff --git a/debian/libmonetdb5-server-gsl.install b/debian/libmonetdb5-server-gsl.install deleted file mode 100644 --- a/debian/libmonetdb5-server-gsl.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/monetdb5/autoload/*_gsl.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_gsl.sql usr/lib/monetdb5/createdb -debian/tmp/usr/lib/monetdb5/gsl.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_gsl.so usr/lib/monetdb5 diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag --- a/sql/backends/monet5/Makefile.ag +++ b/sql/backends/monet5/Makefile.ag @@ -4,7 +4,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. -SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator +SUBDIRS = NOT_WIN32?vaults UDF LSST generator INCLUDES = ../../include ../../common ../../storage ../../server \ ../../../monetdb5/modules/atoms \ diff --git a/sql/backends/monet5/gsl/46_gsl.sql b/sql/backends/monet5/gsl/46_gsl.sql deleted file mode 100644 --- a/sql/backends/monet5/gsl/46_gsl.sql +++ /dev/null @@ -1,12 +0,0 @@ --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. - --- (co) Arjen de Rijke, Bart Scheers --- Use statistical functions from gsl library - --- Calculate Chi squared probability -create function sys.chi2prob(chi2 double, datapoints double) -returns double external name gsl."chi2prob"; diff --git a/sql/backends/monet5/gsl/73_gsl.mal b/sql/backends/monet5/gsl/73_gsl.mal deleted file mode 100644 --- a/sql/backends/monet5/gsl/73_gsl.mal +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. - -include gsl; diff --git a/sql/backends/monet5/gsl/Makefile.ag b/sql/backends/monet5/gsl/Makefile.ag deleted file mode 100644 --- a/sql/backends/monet5/gsl/Makefile.ag +++ /dev/null @@ -1,39 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. - -INCLUDES = ../../../../monetdb5/mal \ - ../../../../common/options \ - ../../../../common/stream \ - ../../../../common/utils \ - ../../../../gdk - -lib__gsl = { - MODULE - DIR = libdir/monetdb5 - SOURCES = gsl.c - LIBS = $(gsl_LIBS) -} - -headers_gslmal = { - HEADERS = mal - DIR = libdir/monetdb5 - SOURCES = gsl.mal -} - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
