Mercurial > octave-nkf

comparison libinterp/octave-value/ov-flt-cx-mat.cc @ 19897: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 b2100e1659ac
comparison
equal deleted inserted replaced
19896:6b851f6acd55 19897:09ed6f7538dd
37 #include "oct-locbuf.h" 37 #include "oct-locbuf.h"
38 38
39 #include "gripes.h" 39 #include "gripes.h"
40 #include "mxarray.h" 40 #include "mxarray.h"
41 #include "oct-obj.h" 41 #include "oct-obj.h"
42 #include "oct-hdf5.h"
42 #include "oct-stream.h" 43 #include "oct-stream.h"
43 #include "ops.h" 44 #include "ops.h"
44 #include "ov-base.h" 45 #include "ov-base.h"
45 #include "ov-base-mat.h" 46 #include "ov-base-mat.h"
46 #include "ov-base-mat.cc" 47 #include "ov-base-mat.cc"
522 matrix = m; 523 matrix = m;
523 } 524 }
524 return true; 525 return true;
525 } 526 }
526 527
528 bool
529 octave_float_complex_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool)
530 {
531 bool retval = false;
532
527 #if defined (HAVE_HDF5) 533 #if defined (HAVE_HDF5)
528 534
529 bool
530 octave_float_complex_matrix::save_hdf5 (hid_t loc_id, const char *name, bool)
531 {
532 dim_vector dv = dims (); 535 dim_vector dv = dims ();
533 int empty = save_hdf5_empty (loc_id, name, dv); 536 int empty = save_hdf5_empty (loc_id, name, dv);
534 if (empty) 537 if (empty)
535 return (empty > 0); 538 return (empty > 0);
536 539
537 int rank = dv.length (); 540 int rank = dv.length ();
538 hid_t space_hid, data_hid, type_hid; 541 hid_t space_hid, data_hid, type_hid;
539 space_hid = data_hid = type_hid = -1; 542 space_hid = data_hid = type_hid = -1;
540 bool retval = true;
541 FloatComplexNDArray m = complex_array_value (); 543 FloatComplexNDArray m = complex_array_value ();
542 544
543 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); 545 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
544 546
545 // Octave uses column-major, while HDF5 uses row-major ordering 547 // Octave uses column-major, while HDF5 uses row-major ordering
599 H5Tclose (complex_type_hid); 601 H5Tclose (complex_type_hid);
600 H5Dclose (data_hid); 602 H5Dclose (data_hid);
601 H5Tclose (type_hid); 603 H5Tclose (type_hid);
602 H5Sclose (space_hid); 604 H5Sclose (space_hid);
603 605
606 #else
607 gripe_save ("hdf5");
608 #endif
609
604 return retval; 610 return retval;
605 } 611 }
606 612
607 bool 613 bool
608 octave_float_complex_matrix::load_hdf5 (hid_t loc_id, const char *name) 614 octave_float_complex_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name)
609 { 615 {
610 bool retval = false; 616 bool retval = false;
617
618 #if defined (HAVE_HDF5)
611 619
612 dim_vector dv; 620 dim_vector dv;
613 int empty = load_hdf5_empty (loc_id, name, dv); 621 int empty = load_hdf5_empty (loc_id, name, dv);
614 if (empty > 0) 622 if (empty > 0)
615 matrix.resize (dv); 623 matrix.resize (dv);
674 682
675 H5Tclose (complex_type); 683 H5Tclose (complex_type);
676 H5Sclose (space_id); 684 H5Sclose (space_id);
677 H5Dclose (data_hid); 685 H5Dclose (data_hid);
678 686
679 return retval; 687 #else
680 } 688 gripe_load ("hdf5");
681
682 #endif 689 #endif
690
691 return retval;
692 }
683 693
684 void 694 void
685 octave_float_complex_matrix::print_raw (std::ostream& os, 695 octave_float_complex_matrix::print_raw (std::ostream& os,
686 bool pr_as_read_syntax) const 696 bool pr_as_read_syntax) const
687 { 697 {