Mercurial > hg > octave-nkf

comparison libinterp/octave-value/ov-re-sparse.cc @ 20070:09ed6f7538dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid needing to include hdf5 in public header files (bug #44370, #43180) * oct-hdf5-id.cc, oct-hdf5-id.h: New files. * libinterp/corefcn/module.mk: Update. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Remove $(HDF5_CPPFLAGS) from the list. * load-save.h (enum load_save_format_type): Always include LS_HDF5 in the list of values. * ls-hdf5.cc (read_hdf5_data, save_hdf5_data): Call check_hdf5_id_type. * oct-hdf5.h: Also #define HDF5_SAVE_TYPE. * ov.h, ov-base.h: Include oct-hdf5-id.h instead of oct-hdf5.h. Always declare load_hdf5 and save_hdf5 functions. * ov-base-int.cc, ov-base-int.h, ov-base.cc, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h, ov-complex.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-lazy-idx.h, ov-oncleanup.cc, ov-oncleanup.h, ov-range.cc ov-range.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Move #ifdef HAVE_HDF5 inside load_hdf5 and save_hdf5 functions. Always declare and define load_hdf5 and save_hdf5 functions.
author John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
date Thu, 26 Feb 2015 10:49:20 -0500
parents 4197fc428c7d
children aa36fb998a4d
comparison
equal deleted inserted replaced
20069:6b851f6acd55 20070:09ed6f7538dd
36 #include "mxarray.h" 36 #include "mxarray.h"
37 #include "ov-base.h" 37 #include "ov-base.h"
38 #include "ov-scalar.h" 38 #include "ov-scalar.h"
39 #include "gripes.h" 39 #include "gripes.h"
40 40
41 #include "oct-hdf5.h"
41 #include "ls-hdf5.h" 42 #include "ls-hdf5.h"
42 43
43 #include "ov-re-sparse.h" 44 #include "ov-re-sparse.h"
44 45
45 #include "ov-base-sparse.h" 46 #include "ov-base-sparse.h"
395 matrix = m; 396 matrix = m;
396 397
397 return true; 398 return true;
398 } 399 }
399 400
401 bool
402 octave_sparse_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
403 bool save_as_floats)
404 {
405 bool retval = false;
406
400 #if defined (HAVE_HDF5) 407 #if defined (HAVE_HDF5)
401 408
402 bool
403 octave_sparse_matrix::save_hdf5 (hid_t loc_id, const char *name,
404 bool save_as_floats)
405 {
406 dim_vector dv = dims (); 409 dim_vector dv = dims ();
407 int empty = save_hdf5_empty (loc_id, name, dv); 410 int empty = save_hdf5_empty (loc_id, name, dv);
408 if (empty) 411 if (empty)
409 return (empty > 0); 412 return (empty > 0);
410 413
420 if (group_hid < 0) 423 if (group_hid < 0)
421 return false; 424 return false;
422 425
423 hid_t space_hid, data_hid; 426 hid_t space_hid, data_hid;
424 space_hid = data_hid = -1; 427 space_hid = data_hid = -1;
425 bool retval = true;
426 SparseMatrix m = sparse_matrix_value (); 428 SparseMatrix m = sparse_matrix_value ();
427 octave_idx_type tmp; 429 octave_idx_type tmp;
428 hsize_t hdims[2]; 430 hsize_t hdims[2];
429 431
430 space_hid = H5Screate_simple (0, hdims, 0); 432 space_hid = H5Screate_simple (0, hdims, 0);
625 H5P_DEFAULT, dtmp) >= 0; 627 H5P_DEFAULT, dtmp) >= 0;
626 H5Dclose (data_hid); 628 H5Dclose (data_hid);
627 H5Sclose (space_hid); 629 H5Sclose (space_hid);
628 H5Gclose (group_hid); 630 H5Gclose (group_hid);
629 631
632 #else
633 gripe_save ("hdf5");
634 #endif
635
630 return retval; 636 return retval;
631 } 637 }
632 638
633 bool 639 bool
634 octave_sparse_matrix::load_hdf5 (hid_t loc_id, const char *name) 640 octave_sparse_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name)
635 { 641 {
642 bool retval = false;
643
644 #if defined (HAVE_HDF5)
645
636 octave_idx_type nr, nc, nz; 646 octave_idx_type nr, nc, nz;
637 hid_t group_hid, data_hid, space_hid; 647 hid_t group_hid, data_hid, space_hid;
638 hsize_t rank; 648 hsize_t rank;
639 649
640 dim_vector dv; 650 dim_vector dv;
837 H5Gclose (group_hid); 847 H5Gclose (group_hid);
838 return false; 848 return false;
839 } 849 }
840 850
841 double *dtmp = m.xdata (); 851 double *dtmp = m.xdata ();
842 bool retval = false; 852
843 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, 853 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
844 H5P_DEFAULT, dtmp) >= 0 854 H5P_DEFAULT, dtmp) >= 0
845 && m.indices_ok ()) 855 && m.indices_ok ())
846 { 856 {
847 retval = true; 857 retval = true;
850 860
851 H5Sclose (space_hid); 861 H5Sclose (space_hid);
852 H5Dclose (data_hid); 862 H5Dclose (data_hid);
853 H5Gclose (group_hid); 863 H5Gclose (group_hid);
854 864
865 #else
866 gripe_load ("hdf5");
867 #endif
868
855 return retval; 869 return retval;
856 } 870 }
857
858 #endif
859 871
860 mxArray * 872 mxArray *
861 octave_sparse_matrix::as_mxArray (void) const 873 octave_sparse_matrix::as_mxArray (void) const
862 { 874 {
863 mwSize nz = nzmax (); 875 mwSize nz = nzmax ();