From b55ce24f61b6c7d4ac402256153b1192a4194095 Mon Sep 17 00:00:00 2001 From: Umar Arshad Date: Mon, 19 Jun 2017 23:52:08 -0400 Subject: [PATCH] Fix variable name(IN) that conflicts with a macro defined in Windows The IN name is defined in the minwindef.h header. Transform also defines an IN variable which conflicts with this macro and causing compilation errors. --- src/api/c/transform_coordinates.cpp | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/api/c/transform_coordinates.cpp b/src/api/c/transform_coordinates.cpp index 9623f58bc3..b5b6ee736c 100644 --- a/src/api/c/transform_coordinates.cpp +++ b/src/api/c/transform_coordinates.cpp @@ -29,40 +29,40 @@ Array multiplyIndexed(const Array &lhs, const Array &rhs, std::vector -static af_array transform_coordinates(const af_array& tf, const float d0, const float d1) +static af_array transform_coordinates(const af_array& tf_, const float d0_, const float d1_) { af::dim4 h_dims(4, 3); - T h_in[4*3] = { (T)0, (T)0, (T)d1, (T)d1, - (T)0, (T)d0, (T)d0, (T)0, + T h_in[4*3] = { (T)0, (T)0, (T)d1_, (T)d1_, + (T)0, (T)d0_, (T)d0_, (T)0, (T)1, (T)1, (T)1, (T)1 }; - const Array TF = getArray(tf); - Array IN = createHostDataArray(h_dims, h_in); + const Array tf = getArray(tf_); + Array in = createHostDataArray(h_dims, h_in); std::vector idx(2); idx[0] = af_make_seq(0, 2, 1); - // w = 1.0 / matmul(TF, IN(span, 2)); - // iw = matmul(TF, IN(span, 2)); + // w = 1.0 / matmul(tf, in(span, 2)); + // iw = matmul(tf, in(span, 2)); idx[1] = af_make_seq(2, 2, 1); - Array IW = multiplyIndexed(IN, TF, idx); + Array iw = multiplyIndexed(in, tf, idx); - // xt = w * matmul(TF, IN(span, 0)); - // xt = matmul(TF, IN(span, 0)) / iw; + // xt = w * matmul(tf, in(span, 0)); + // xt = matmul(tf, in(span, 0)) / iw; idx[1] = af_make_seq(0, 0, 1); - Array XT = arithOp(multiplyIndexed(IN, TF, idx), IW, IW.dims()); + Array xt = arithOp(multiplyIndexed(in, tf, idx), iw, iw.dims()); - // yt = w * matmul(TF, IN(span, 1)); - // yt = matmul(TF, IN(span, 1)) / iw; + // yt = w * matmul(tf, in(span, 1)); + // yt = matmul(tf, in(span, 1)) / iw; idx[1] = af_make_seq(1, 1, 1); - Array YT = arithOp(multiplyIndexed(IN, TF, idx), IW, IW.dims()); + Array yw = arithOp(multiplyIndexed(in, tf, idx), iw, iw.dims()); // return join(1, xt, yt) - Array R = join(1, XT, YT); - return getHandle(R); + Array r = join(1, xt, yw); + return getHandle(r); } -af_err af_transform_coordinates(af_array *out, const af_array tf, const float d0, const float d1) +af_err af_transform_coordinates(af_array *out, const af_array tf, const float d0_, const float d1_) { try { const ArrayInfo& tfInfo = getInfo(tf); @@ -72,8 +72,8 @@ af_err af_transform_coordinates(af_array *out, const af_array tf, const float d0 af_array output; af_dtype type = tfInfo.getType(); switch(type) { - case f32: output = transform_coordinates(tf, d0, d1); break; - case f64: output = transform_coordinates(tf, d0, d1); break; + case f32: output = transform_coordinates(tf, d0_, d1_); break; + case f64: output = transform_coordinates(tf, d0_, d1_); break; default : TYPE_ERROR(1, type); } std::swap(*out, output);