Mercurial > octave

comparison libinterp/octave-value/ov-cx-sparse.cc @ 21211:2cf8bc5c7017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests * configure.ac (HAVE_HDF5_INT2FLOAT_CONVERSIONS): AC_DEFINE here. * ls-hdf5.cc (HAVE_HDF5_INT2FLOAT_CONVERSION): Delete definition. * ls-hdf5.cc, ls-hdf5.h, ccolamd.cc, dmperm.cc, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, pt-eval.cc: Use #if defined (HAVE_FOO) instead of #if HAVE_FOO.
author John W. Eaton <jwe@octave.org>
date Sat, 06 Feb 2016 08:48:47 -0500
parents fcac5dbbf9ed
children 5f318c8ec634
comparison
equal deleted inserted replaced
21210:4f7d3989c462 21211:2cf8bc5c7017
375 return (empty > 0); 375 return (empty > 0);
376 376
377 // Ensure that additional memory is deallocated 377 // Ensure that additional memory is deallocated
378 matrix.maybe_compress (); 378 matrix.maybe_compress ();
379 379
380 #if HAVE_HDF5_18 380 #if defined (HAVE_HDF5_18)
381 hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, 381 hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
382 octave_H5P_DEFAULT); 382 octave_H5P_DEFAULT);
383 #else 383 #else
384 hid_t group_hid = H5Gcreate (loc_id, name, 0); 384 hid_t group_hid = H5Gcreate (loc_id, name, 0);
385 #endif 385 #endif
397 { 397 {
398 H5Gclose (group_hid); 398 H5Gclose (group_hid);
399 return false; 399 return false;
400 } 400 }
401 401
402 #if HAVE_HDF5_18 402 #if defined (HAVE_HDF5_18)
403 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, 403 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid,
404 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 404 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
405 #else 405 #else
406 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, 406 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid,
407 octave_H5P_DEFAULT); 407 octave_H5P_DEFAULT);
422 H5Sclose (space_hid); 422 H5Sclose (space_hid);
423 H5Gclose (group_hid); 423 H5Gclose (group_hid);
424 return false; 424 return false;
425 } 425 }
426 426
427 #if HAVE_HDF5_18 427 #if defined (HAVE_HDF5_18)
428 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, 428 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid,
429 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 429 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
430 #else 430 #else
431 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, 431 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid,
432 octave_H5P_DEFAULT); 432 octave_H5P_DEFAULT);
447 H5Sclose (space_hid); 447 H5Sclose (space_hid);
448 H5Gclose (group_hid); 448 H5Gclose (group_hid);
449 return false; 449 return false;
450 } 450 }
451 451
452 #if HAVE_HDF5_18 452 #if defined (HAVE_HDF5_18)
453 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, 453 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid,
454 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 454 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
455 #else 455 #else
456 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, 456 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid,
457 octave_H5P_DEFAULT); 457 octave_H5P_DEFAULT);
485 { 485 {
486 H5Gclose (group_hid); 486 H5Gclose (group_hid);
487 return false; 487 return false;
488 } 488 }
489 489
490 #if HAVE_HDF5_18 490 #if defined (HAVE_HDF5_18)
491 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, 491 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid,
492 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 492 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
493 #else 493 #else
494 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, 494 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid,
495 octave_H5P_DEFAULT); 495 octave_H5P_DEFAULT);
523 { 523 {
524 H5Gclose (group_hid); 524 H5Gclose (group_hid);
525 return false; 525 return false;
526 } 526 }
527 527
528 #if HAVE_HDF5_18 528 #if defined (HAVE_HDF5_18)
529 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, 529 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid,
530 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 530 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
531 #else 531 #else
532 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, 532 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid,
533 octave_H5P_DEFAULT); 533 octave_H5P_DEFAULT);
560 warning ("save: saving as doubles instead"); 560 warning ("save: saving as doubles instead");
561 } 561 }
562 else 562 else
563 save_type_hid = H5T_NATIVE_FLOAT; 563 save_type_hid = H5T_NATIVE_FLOAT;
564 } 564 }
565 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS 565 #if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS)
566 // hdf5 currently doesn't support float/integer conversions 566 // hdf5 currently doesn't support float/integer conversions
567 else 567 else
568 { 568 {
569 double max_val, min_val; 569 double max_val, min_val;
570 570
579 { 579 {
580 H5Sclose (space_hid); 580 H5Sclose (space_hid);
581 H5Gclose (group_hid); 581 H5Gclose (group_hid);
582 return false; 582 return false;
583 } 583 }
584 #if HAVE_HDF5_18 584 #if defined (HAVE_HDF5_18)
585 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, 585 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid,
586 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 586 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
587 #else 587 #else
588 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, octave_H5P_DEFAULT); 588 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, octave_H5P_DEFAULT);
589 #endif 589 #endif
633 if (empty > 0) 633 if (empty > 0)
634 matrix.resize (dv); 634 matrix.resize (dv);
635 if (empty) 635 if (empty)
636 return (empty > 0); 636 return (empty > 0);
637 637
638 #if HAVE_HDF5_18 638 #if defined (HAVE_HDF5_18)
639 group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); 639 group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
640 #else 640 #else
641 group_hid = H5Gopen (loc_id, name); 641 group_hid = H5Gopen (loc_id, name);
642 #endif 642 #endif
643 if (group_hid < 0) return false; 643 if (group_hid < 0) return false;
644 644
645 #if HAVE_HDF5_18 645 #if defined (HAVE_HDF5_18)
646 data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); 646 data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT);
647 #else 647 #else
648 data_hid = H5Dopen (group_hid, "nr"); 648 data_hid = H5Dopen (group_hid, "nr");
649 #endif 649 #endif
650 space_hid = H5Dget_space (data_hid); 650 space_hid = H5Dget_space (data_hid);
665 return false; 665 return false;
666 } 666 }
667 667
668 H5Dclose (data_hid); 668 H5Dclose (data_hid);
669 669
670 #if HAVE_HDF5_18 670 #if defined (HAVE_HDF5_18)
671 data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); 671 data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT);
672 #else 672 #else
673 data_hid = H5Dopen (group_hid, "nc"); 673 data_hid = H5Dopen (group_hid, "nc");
674 #endif 674 #endif
675 space_hid = H5Dget_space (data_hid); 675 space_hid = H5Dget_space (data_hid);
690 return false; 690 return false;
691 } 691 }
692 692
693 H5Dclose (data_hid); 693 H5Dclose (data_hid);
694 694
695 #if HAVE_HDF5_18 695 #if defined (HAVE_HDF5_18)
696 data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); 696 data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT);
697 #else 697 #else
698 data_hid = H5Dopen (group_hid, "nz"); 698 data_hid = H5Dopen (group_hid, "nz");
699 #endif 699 #endif
700 space_hid = H5Dget_space (data_hid); 700 space_hid = H5Dget_space (data_hid);
719 719
720 SparseComplexMatrix m (static_cast<octave_idx_type> (nr), 720 SparseComplexMatrix m (static_cast<octave_idx_type> (nr),
721 static_cast<octave_idx_type> (nc), 721 static_cast<octave_idx_type> (nc),
722 static_cast<octave_idx_type> (nz)); 722 static_cast<octave_idx_type> (nz));
723 723
724 #if HAVE_HDF5_18 724 #if defined (HAVE_HDF5_18)
725 data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); 725 data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT);
726 #else 726 #else
727 data_hid = H5Dopen (group_hid, "cidx"); 727 data_hid = H5Dopen (group_hid, "cidx");
728 #endif 728 #endif
729 space_hid = H5Dget_space (data_hid); 729 space_hid = H5Dget_space (data_hid);
762 } 762 }
763 763
764 H5Sclose (space_hid); 764 H5Sclose (space_hid);
765 H5Dclose (data_hid); 765 H5Dclose (data_hid);
766 766
767 #if HAVE_HDF5_18 767 #if defined (HAVE_HDF5_18)
768 data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); 768 data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT);
769 #else 769 #else
770 data_hid = H5Dopen (group_hid, "ridx"); 770 data_hid = H5Dopen (group_hid, "ridx");
771 #endif 771 #endif
772 space_hid = H5Dget_space (data_hid); 772 space_hid = H5Dget_space (data_hid);
802 } 802 }
803 803
804 H5Sclose (space_hid); 804 H5Sclose (space_hid);
805 H5Dclose (data_hid); 805 H5Dclose (data_hid);
806 806
807 #if HAVE_HDF5_18 807 #if defined (HAVE_HDF5_18)
808 data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); 808 data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT);
809 #else 809 #else
810 data_hid = H5Dopen (group_hid, "data"); 810 data_hid = H5Dopen (group_hid, "data");
811 #endif 811 #endif
812 hid_t type_hid = H5Dget_type (data_hid); 812 hid_t type_hid = H5Dget_type (data_hid);