This is an automated email from the ASF dual-hosted git repository.
baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new dd25d90cb1 [SYSTEMDS-3545] Image Translate Linearized
dd25d90cb1 is described below
commit dd25d90cb11329b939982f5df6a8ea83ad029564
Author: baristerzioglu <[email protected]>
AuthorDate: Fri Sep 8 12:53:15 2023 +0200
[SYSTEMDS-3545] Image Translate Linearized
This commit adds the translate operation that is able
to take a linearized image matrix input and move the image x and y
in a direction, while also setting the size of the output image.
Closes #1910
---
scripts/builtin/img_translate_linearized.dml | 64 ++++++++++
.../java/org/apache/sysds/common/Builtins.java | 1 +
.../part1/BuiltinImageTranslateLinearizedTest.java | 138 +++++++++++++++++++++
.../builtin/image_translate_linearized.dml | 43 +++++++
4 files changed, 246 insertions(+)
diff --git a/scripts/builtin/img_translate_linearized.dml
b/scripts/builtin/img_translate_linearized.dml
new file mode 100644
index 0000000000..c2c898d21c
--- /dev/null
+++ b/scripts/builtin/img_translate_linearized.dml
@@ -0,0 +1,64 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+# This function has the same functionality with img_translate but it handles
multiple images at
+# the same time. Each row of the input and output matrix represents a
linearized image/matrix
+# It translates the image and Optionally resizes the image (without scaling).
+# INPUT:
+#
----------------------------------------------------------------------------------------------
+# img_in Input matrix/image (every row represents a linearized
matrix/image)
+# offset_x The distance to move the image in x direction
+# offset_y The distance to move the image in y direction
+# out_w Width of the output image
+# out_h Height of the output image
+# fill_value The background of the image
+# o_w Width of the original 2D images
+# o_h Height of the original 2D images
+#
--------------------------------------------------------------------------------------------
+#
+# OUTPUT:
+#
--------------------------------------------------------------------------------------------
+# img_out Output matrix/image (every row represents a
linearized matrix/image)
+#
--------------------------------------------------------------------------------------------
+
+m_img_translate_linearized = function(Matrix[Double] img_in, Double offset_x,
+Double offset_y,Integer out_w, Integer out_h, Double fill_value, Integer o_w,
Integer o_h)
+return (Matrix[Double] img_out) {
+ offset_x = round(offset_x)
+ offset_y = round(offset_y)
+ img_out = matrix(fill_value, rows=nrow(img_in), cols=out_w * out_h)
+ parfor(y in 1:out_h,check=0) {
+ for (x in 1:out_w) {
+ src_x = x - offset_x
+ src_y = y - offset_y
+ if (src_x >= 1 & src_x <= o_w & src_y >= 1 & src_y <= o_h) {
+ start_index = (src_y - 1) * o_w + src_x
+ dest_index = (y - 1) * out_w + x
+
+ if (start_index >= 1 & start_index <= ncol(img_in) & dest_index >= 1
& dest_index <= ncol(img_out)) {
+ img_out[, dest_index] = img_in[, start_index]
+ }
+ }
+ }
+ }
+}
+
+
diff --git a/src/main/java/org/apache/sysds/common/Builtins.java
b/src/main/java/org/apache/sysds/common/Builtins.java
index 4b781c3931..f8377ce1ed 100644
--- a/src/main/java/org/apache/sysds/common/Builtins.java
+++ b/src/main/java/org/apache/sysds/common/Builtins.java
@@ -163,6 +163,7 @@ public enum Builtins {
IMG_TRANSFORM("img_transform", true),
IMG_TRANSFORM_LINEARIZED("img_transform_linearized", true),
IMG_TRANSLATE("img_translate", true),
+ IMG_TRANSLATE_LINEARIZED("img_translate_linearized", true),
IMG_ROTATE("img_rotate", true),
IMG_SHEAR("img_shear", true),
IMG_CUTOUT("img_cutout", true),
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageTranslateLinearizedTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageTranslateLinearizedTest.java
new file mode 100644
index 0000000000..ce7a9ef386
--- /dev/null
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageTranslateLinearizedTest.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sysds.test.functions.builtin.part1;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.apache.sysds.common.Types.ExecMode;
+import org.apache.sysds.common.Types.ExecType;
+import org.apache.sysds.runtime.matrix.data.MatrixValue;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.apache.sysds.test.TestConfiguration;
+import org.apache.sysds.test.TestUtils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
+@RunWith(Parameterized.class)
[email protected]
+public class BuiltinImageTranslateLinearizedTest extends AutomatedTestBase {
+
+ private final static String TEST_NAME_LINEARIZED =
"image_translate_linearized";
+ private final static String TEST_DIR = "functions/builtin/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
BuiltinImageTranslateLinearizedTest.class.getSimpleName() + "/";
+ private final static double eps = 1e-10;
+ private final static double spSparse = 0.05;
+ private final static double spDense = 0.5;
+
+ @Parameterized.Parameter()
+ public int img_rows;
+ @Parameterized.Parameter(1)
+ public int img_cols;
+ @Parameterized.Parameter(2)
+ public int rows; // number of images
+ @Parameterized.Parameter(3)
+ public int offset_x;
+ @Parameterized.Parameter(4)
+ public int offset_y;
+ @Parameterized.Parameter(5)
+ public int fill_value;
+ @Parameterized.Parameter(6)
+ public int out_w;
+ @Parameterized.Parameter(7)
+ public int out_h;
+ public int cols; // Initialized based on img_rows * img_cols
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {12,12,4,0,0,11,15,16},
+ {12,12,4,0,0,11,12,12},
+ {750,750,2,50,0,11,750,750},
+ {750,750,2,-50,-10,11,750,750},
+ {750,750,2,0,10,11,750,750},
+ {1400,50,2,80,10,11,1400,20},
+ {1400,100,2,-50,10,11,1200,80},
+ {512,650,5,30,20,11,1200,80},
+ });
+ }
+
+ @Override
+ public void setUp() {
+ cols = img_rows * img_cols;
+ addTestConfiguration(TEST_NAME_LINEARIZED, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME_LINEARIZED, new String[]{"B_x"}));
+ }
+
+ @Test
+ public void testImageTranslateLinearized() {
+ runImageTranslateLinearizedTest(false, ExecType.CP);
+ }
+
+ @Test
+ @Ignore
+ public void testImageTranslateLinearizedSP() {
+ runImageTranslateLinearizedTest(false, ExecType.SPARK);
+ }
+
+
+
+ private void runImageTranslateLinearizedTest(boolean sparse, ExecType
instType) {
+ ExecMode platformOld = setExecMode(instType);
+ disableOutAndExpectedDeletion();
+
+ try {
+ loadTestConfiguration(getTestConfiguration(TEST_NAME_LINEARIZED));
+
+ double sparsity = sparse ? spSparse : spDense;
+ String HOME = SCRIPT_DIR + TEST_DIR;
+
+ fullDMLScriptName = HOME + TEST_NAME_LINEARIZED + ".dml";
+ programArgs = new String[]{"-nvargs",
+ "in_file=" + input("A"),
+ "x_out_reshape_file=" + output("B_x_reshape"),
+ "x_out_file=" + output("B_x"),
+ "orig_h=" + img_rows,
+ "orig_w=" + img_cols,
+ "offset_x=" + offset_x,
+ "offset_y=" + offset_y,
+ "fill_value=" + fill_value,
+ "out_w=" + out_w,
+ "out_h=" + out_h
+ };
+
+ double[][] A = getRandomMatrix(rows, cols, 0, 255, sparsity, 7);
+ writeInputMatrixWithMTD("A", A, true);
+
+ runTest(true, false, null, -1);
+
+ HashMap<MatrixValue.CellIndex, Double> dmlfileLinearizedX =
readDMLMatrixFromOutputDir("B_x");
+
+ HashMap<MatrixValue.CellIndex, Double> dmlfileX =
readDMLMatrixFromOutputDir("B_x_reshape");
+
+ TestUtils.compareMatrices(dmlfileLinearizedX, dmlfileX, eps,
"Stat-DML-LinearizedX", "Stat-DML-X");
+
+
+ } finally {
+ rtplatform = platformOld;
+ }
+ }
+}
diff --git a/src/test/scripts/functions/builtin/image_translate_linearized.dml
b/src/test/scripts/functions/builtin/image_translate_linearized.dml
new file mode 100644
index 0000000000..a419489231
--- /dev/null
+++ b/src/test/scripts/functions/builtin/image_translate_linearized.dml
@@ -0,0 +1,43 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+
+input_linearized = read($in_file);
+rows_linear = nrow(input_linearized);
+cols_linear = ncol(input_linearized);
+fill_value =$fill_value;
+orig_h = $orig_h;
+orig_w= $orig_w;
+offset_x = $offset_x;
+offset_y = $offset_y;
+out_w =$out_w;
+out_h=$out_h;
+img = matrix(input_linearized, rows=rows_linear, cols=cols_linear);
+img_out =
img_translate_linearized(img,offset_x,offset_y,out_w,out_h,fill_value,orig_w,orig_h);
+img_out_flattened_x = matrix(0, rows=rows_linear, cols=out_w*out_h);
+for(i in 1:rows_linear) {
+ image_i = matrix(img[i,], rows=orig_h, cols=orig_w);
+ img_out_x =
img_translate(image_i,offset_x,offset_y,out_w,out_h,fill_value);
+ img_out_flattened_x[i,] = matrix(img_out_x, rows=1, cols=out_w*out_h);
+
+}
+write(img_out, $x_out_file);
+write(img_out_flattened_x, $x_out_reshape_file);
