mxe-octave: src/of-sparsersb-1-fixes.patch annotate

annotate src/of-sparsersb-1-fixes.patch @ 4185:b7c4178dadc4

sparsersb: update patch to latest from sparser repo, enable openmp * src/of-sparsersb-1-fixes.patch: update patch * src/librsb.mk: remove --disable-openmp

author	John D
date	Mon, 08 Aug 2016 17:23:57 -0400
parents	fc1bee8ff2d4
children

rev	line source
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	1 diff -ur sparsersb-1.0.1.orig/src/sparsersb.cc sparsersb-1.0.1/src/sparsersb.cc
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	2 --- sparsersb-1.0.1.orig/src/sparsersb.cc 2016-08-07 18:22:30.539481175 -0400
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	3 +++ sparsersb-1.0.1/src/sparsersb.cc 2016-08-08 12:07:33.136989176 -0400
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	4 @@ -87,6 +87,8 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	5 #endif
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	6 #endif
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	7
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	8 +#define RSBOI_USE_PATCH_38143 ( defined(OCTAVE_MAJOR_VERSION) && (OCTAVE_MAJOR_VERSION>=4) ) /* See http://savannah.gnu.org/bugs/?48335#comment5 */
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	9 +
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	10 #if 0
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	11 #define RSBOI_WARN( MSG ) \
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	12 octave_stdout << "Warning in "<<__func__<<"(), in file "<<__FILE__<<" at line "<<__LINE__<<":\n" << MSG;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	13 @@ -1239,7 +1241,9 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	14
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	15 private:
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	16 public:
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	17 +#if !RSBOI_USE_PATCH_38143
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	18 DECLARE_OCTAVE_ALLOCATOR
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	19 +#endif /* RSBOI_USE_PATCH_38143 */
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	20 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	21 };/* end of class octave_sparsersb_mtx definition */
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	22
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	23 @@ -1253,10 +1257,24 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	24 }
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	25 #endif
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	26
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	27 +#if RSBOI_USE_PATCH_38143
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	28 +#define RSBOI_CAST_CONV_ARG(ARGT) /* Seems like in 4.1.0+ CAST_CONV_ARG is not there. */ \
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	29 + ARGT v = dynamic_cast< ARGT > (a)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	30 +#define RSBOI_CAST_UNOP_ARG(ARGT) /* Seems like in 4.1.0+ CAST_UNOP_ARG is not there. */ \
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	31 + RSBOI_CAST_CONV_ARG(ARGT)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	32 +#define RSB_CAST_BINOP_ARGS(ARGT_V1, ARGT_V2); /* Seems like in 4.1.0+ CAST_BINOP_ARGS is not there. */ \
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	33 + ARGT_V1 v1 = dynamic_cast< ARGT_V1 > (a1); \
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	34 + ARGT_V2 v2 = dynamic_cast< ARGT_V2 > (a2);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	35 +#else /* RSBOI_USE_PATCH_38143 */
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	36 +#define RSBOI_CAST_CONV_ARG CAST_CONV_ARG
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	37 +#define RSBOI_CAST_UNOP_ARG CAST_UNOP_ARG
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	38 +#define RSB_CAST_BINOP_ARGS CAST_BINOP_ARGS
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	39 +#endif /* RSBOI_USE_PATCH_38143 */
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	40 +
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	41 static octave_base_value * default_numeric_conversion_function (const octave_base_value& a)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	42 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	43 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	44 - CAST_CONV_ARG (const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	45 + RSBOI_CAST_CONV_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	46 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	47 RSBOI_WARN(RSBOI_0_UNFFEMSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	48 if(v.is_real_type())
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	49 @@ -1274,7 +1292,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	50 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	51 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	52 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	53 - CAST_CONV_ARG (const octave_sparsersb_mtx &);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	54 + RSBOI_CAST_CONV_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	55 return new octave_sparse_matrix (v.matrix_value ());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	56 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	57
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	58 @@ -1283,7 +1301,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	59 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	60 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	61 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	62 - CAST_CONV_ARG (const octave_sparsersb_mtx &);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	63 + RSBOI_CAST_CONV_ARG (const octave_sparsersb_mtx&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	64 return new octave_sparse_matrix (v.matrix_value ());
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	65 }
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	66 #endif
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	67 @@ -1292,7 +1310,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	68 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	69 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	70 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	71 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	72 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	73 return new octave_sparsersb_mtx (v);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	74 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	75
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	76 @@ -1301,7 +1319,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	77 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	78 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	79 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	80 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	81 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	82 const octave_idx_type rn=v.mtxAp->nrA,cn=v.mtxAp->ncA;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	83 Matrix v2(rn,cn);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	84 octave_value retval = v2;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	85 @@ -1315,7 +1333,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	86 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	87 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	88 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	89 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	90 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	91 const octave_idx_type rn=v.mtxAp->nrA,cn=v.mtxAp->ncA;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	92 Matrix v2(rn,cn);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	93 octave_value retval = v2;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	94 @@ -1330,21 +1348,21 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	95 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	96 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	97 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	98 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	99 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	100 return v.cp_ubop(RSB_ELOPF_NEG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	101 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	102
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	103 DEFUNOP (transpose, sparse_rsb_mtx)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	104 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	105 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	106 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	107 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	108 return v.rsboi_get_scaled_copy(rsboi_pone[0],RSB_TRANSPOSITION_T);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	109 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	110
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	111 DEFUNOP (htranspose, sparse_rsb_mtx)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	112 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	113 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	114 - CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	115 + RSBOI_CAST_UNOP_ARG (const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	116 return v.rsboi_get_scaled_copy(rsboi_pone[0],RSB_TRANSPOSITION_C);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	117 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	118
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	119 @@ -1454,7 +1472,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	120 DEFBINOP(ldiv, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	121 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	122 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	123 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	124 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	125
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	126 if(v1.is__triangular())
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	127 return rsboi_spsm(v1,v2,RSB_TRANSPOSITION_N);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	128 @@ -1469,7 +1487,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	129 DEFBINOP(trans_ldiv, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	130 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	131 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	132 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	133 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	134
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	135 if(v1.is__triangular())
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	136 return rsboi_spsm(v1,v2,RSB_TRANSPOSITION_T);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	137 @@ -1485,7 +1503,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	138 DEFBINOP(c_ldiv, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	139 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	140 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	141 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	142 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	143
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	144 if(v1.is__triangular())
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	145 return rsboi_spsm(v1,v2,RSB_TRANSPOSITION_N);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	146 @@ -1500,7 +1518,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	147 DEFBINOP(trans_c_ldiv, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	148 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	149 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	150 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	151 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	152 if(v1.is__triangular())
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	153 return rsboi_spsm(v1,v2,RSB_TRANSPOSITION_T);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	154
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	155 @@ -1539,7 +1557,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	156 #if RSBOI_WANT_DOUBLE_COMPLEX
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	157 DEFBINOP(rsb_c_div, sparse_rsb_mtx, complex)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	158 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	159 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	160 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	161 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	162 return v1.rsboi_get_scaled_copy_inv(v2.complex_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	163 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	164 @@ -1547,14 +1565,14 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	165
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	166 DEFBINOP(rsb_s_div, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	167 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	168 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	169 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	170 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	171 return v1.rsboi_get_scaled_copy_inv(v2.scalar_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	172 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	173
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	174 DEFBINOP(rsb_s_mul, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	175 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	176 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	177 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	178 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	179 return v1.rsboi_get_scaled_copy(v2.scalar_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	180 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	181 @@ -1562,7 +1580,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	182 #if RSBOI_WANT_DOUBLE_COMPLEX
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	183 DEFBINOP(rsb_c_mul, sparse_rsb_mtx, complex)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	184 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	185 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	186 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	187 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	188 return v1.rsboi_get_scaled_copy(v2.complex_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	189 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	190 @@ -1571,7 +1589,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	191 #if 0
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	192 DEFBINOP(rsb_s_pow, sparse_rsb_mtx, scalar)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	193 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	194 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	195 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	196 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	197 return v1.rsboi_get_power_copy(v2.scalar_value());
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	198 }
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	199 @@ -1581,7 +1599,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	200 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	201 rsb_err_t errval = RSB_ERR_NO_ERROR;
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	202 RSBOI_FIXME("I dunno how to trigger this!");
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	203 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	204 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	205 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	206 //rsb_assign(v1.mtxAp, v2.mtxAp);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	207 errval = rsb_mtx_clone(&v1.mtxAp,RSB_NUMERICAL_TYPE_SAME_TYPE,RSB_TRANSPOSITION_N,NULL,v2.mtxAp,RSBOI_EXPF);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	208 @@ -1590,7 +1608,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	209
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	210 DEFASSIGNOP (assignm, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	211 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	212 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	213 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	214 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	215 RSBOI_DESTROY(v1.mtxAp);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	216 octave_value retval;
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	217 @@ -1605,7 +1623,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	218 #if 0
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	219 DEFASSIGNOP(rsb_op_mul_eq_s, sparse_rsb_mtx, scalar)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	220 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	221 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	222 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	223 octave_value retval;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	224 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	225 RSBOI_PERROR(v1.rsboi_scale(v2.scalar_value()));
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	226 @@ -1635,7 +1653,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	227
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	228 DEFASSIGNOP(rsb_op_div_eq_s, sparse_rsb_mtx, scalar)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	229 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	230 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	231 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	232 octave_value retval;
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	233 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	234 RSBOI_PERROR(v1.rsboi_scale_inv(v2.scalar_value()));
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	235 @@ -1666,7 +1684,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	236
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	237 DEFBINOP(rsb_el_mul_s, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	238 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	239 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	240 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	241 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	242 return v1.rsboi_get_scaled_copy(v2.scalar_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	243 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	244 @@ -1674,7 +1692,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	245 #if RSBOI_WANT_DOUBLE_COMPLEX
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	246 DEFBINOP(rsb_el_mul_c, sparse_rsb_mtx, complex)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	247 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	248 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	249 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	250 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	251 return v1.rsboi_get_scaled_copy(v2.complex_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	252 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	253 @@ -1682,7 +1700,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	254
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	255 DEFBINOP(rsb_el_div_s, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	256 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	257 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	258 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	259 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	260 return v1.rsboi_get_scaled_copy_inv(v2.scalar_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	261 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	262 @@ -1690,7 +1708,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	263 #if RSBOI_WANT_DOUBLE_COMPLEX
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	264 DEFBINOP(rsb_el_div_c, sparse_rsb_mtx, complex)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	265 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	266 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	267 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_complex&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	268 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	269 return v1.rsboi_get_scaled_copy_inv(v2.complex_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	270 }
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	271 @@ -1700,7 +1718,7 @@
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	272 #if 0
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	273 DEFASSIGNOP(rsb_op_el_div_eq, sparse_rsb_mtx, scalar)
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	274 {
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	275 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	276 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	277 std::cout << "rsb_op_el_div_eq!\n";
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	278 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	279 return v1.rsboi_get_scaled_copy_inv(v2.complex_value());
b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	280 @@ -1710,21 +1728,21 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	281 DEFASSIGNOP(rsb_op_el_mul_eq_sc, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	282 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	283 rsb_err_t errval = RSB_ERR_NO_ERROR;
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	284 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	285 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	286 return v1.scale_rows(v2,false);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	287 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	288
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	289 DEFASSIGNOP(rsb_op_el_div_eq_sc, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	290 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	291 rsb_err_t errval = RSB_ERR_NO_ERROR;
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	292 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	293 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	294 return v1.scale_rows(v2,true);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	295 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	296 #endif /* RSBOI_WANT_DOUBLE_COMPLEX */
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	297
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	298 DEFBINOP(el_pow, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	299 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	300 - CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	301 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	302 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	303 RSBOI_T alpha=v2.scalar_value();
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	304 return v1.cp_ubop(RSB_ELOPF_POW,&alpha);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	305 @@ -1733,7 +1751,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	306 #ifdef RSB_FULLY_IMPLEMENTED
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	307 DEFASSIGNOP (assigns, sparse_rsb_mtx, scalar)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	308 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	309 - CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	310 + RSB_CAST_BINOP_ARGS (octave_sparsersb_mtx &, const octave_scalar&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	311 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	312 v1.assign(idx, v2.matrix_value());
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	313 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	314 @@ -1744,28 +1762,28 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	315 DEFBINOP(op_sub, sparse_rsb_mtx, sparse_rsb_mtx)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	316 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	317 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	318 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	319 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	320 return v1.rsboi_sppsp(&rsboi_mone[0],v2);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	321 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	322
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	323 DEFBINOP(op_add, sparse_rsb_mtx, sparse_rsb_mtx)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	324 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	325 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	326 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	327 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	328 return v1.rsboi_sppsp(&rsboi_pone[0],v2);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	329 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	330
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	331 DEFBINOP(op_spmul, sparse_rsb_mtx, sparse_rsb_mtx)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	332 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	333 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	334 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	335 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_sparsersb_mtx&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	336 return v1.rsboi_spmsp(v2);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	337 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	338
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	339 DEFBINOP(op_mul, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	340 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	341 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	342 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	343 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	344 return v1.rsboi_spmm(v2, false);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	345 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	346
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	347 @@ -1773,7 +1791,7 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	348 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	349 // ".'*" operator
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	350 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	351 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	352 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	353 return v1.rsboi_spmm(v2, true);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	354 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	355
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	356 @@ -1781,14 +1799,14 @@
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	357 DEFBINOP(op_c_mul, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	358 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	359 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	360 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	361 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	362 return v1.rsboi_spmm(v2, false);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	363 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	364
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	365 DEFBINOP(op_c_trans_mul, sparse_rsb_mtx, matrix)
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	366 {
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	367 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	368 - CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4185 b7c4178dadc4 sparsersb: update patch to latest from sparser repo, enable openmp John D parents: 4184 diff changeset	369 + RSB_CAST_BINOP_ARGS (const octave_sparsersb_mtx&, const octave_complex_matrix&);
4184 fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	370 return v1.rsboi_spmm(v2, true);
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	371 }
fc1bee8ff2d4 of-sparsersb: update to v1.0.1 John D parents: diff changeset	372 #endif /* RSBOI_WANT_DOUBLE_COMPLEX */

Mercurial > mxe-octave

annotate src/of-sparsersb-1-fixes.patch @ 4185:b7c4178dadc4