added optimizations to em++ and improved test

Author: seveibar

Makefile

@@ -3,6 +3,7 @@ build/module.js: setup globals.bc
 	# -Os \
 	# -s TOTAL_MEMORY=100MB
 	docker run -it -v $(shell pwd):/src seveibar/emscripten em++ \
+		-O3 -ffast-math \
 		-std=c++1z -I/usr/local/include --bind \
 		-o build/module.js ./module.cpp \
 		-s MODULARIZE=1 \
@@ -13,6 +14,7 @@ build/module.js: setup globals.bc
 
 	# Create separate node version
 	docker run -it -v $(shell pwd):/src seveibar/emscripten em++ \
+		-O3 -ffast-math \
 		-std=c++1z -I/usr/local/include --bind \
 		-o build/node.js ./module.cpp \
 		-s MODULARIZE=1 \
@@ -31,6 +33,7 @@ build/module.js: setup globals.bc
 .PHONY: debug_build/module.js
 debug_build/module.js: setup globals.bc
 	docker run -it -v $(shell pwd):/src seveibar/emscripten em++ \
+		-O3 -ffast-math \
 		-std=c++1z -I/usr/local/include --bind -s "EXTRA_EXPORTED_RUNTIME_METHODS=['getValue']" \
 		-o build/module.js ./module.cpp \
 		-s ALLOW_MEMORY_GROWTH=1 -s ASSERTIONS=1 -s SAFE_HEAP=1 -s DETERMINISTIC=1 -s DEMANGLE_SUPPORT=1 \
@@ -43,8 +46,8 @@ globals.bc: globals.cpp globals.hpp
 
 test_modulejs: debug_build/module.js
 	npx ava --verbose ./tests/modulejs/basic.test.js
-	python util/read-bin-image.py tests/modulejs/mask.bin
-	python util/read-bin-image.py tests/modulejs/mask-polygon-only.bin
+	python util/read-bin-image.py tests/modulejs/mask-320x249.bin
+	python util/read-bin-image.py tests/modulejs/mask-320x249-polygon-only.bin
 
 assets/orange-320x249.bin:
 	mkdir -p assets
@@ -87,7 +90,7 @@ build/test_polygon_fill: setup globals.o
 .PHONY: test_polygon_fill
 test_polygon_fill: build/test_polygon_fill
 	./build/test_polygon_fill
-	python util/read-bin-image.py ./polygon_fill.bin
+	python util/read-bin-image.py ./polygon_fill-320x249.bin
 
 .PHONY: test_min_cut
 test_min_cut: build/test_min_cut

super_pixel.cpp

@@ -20,6 +20,8 @@ Implementation of SLIC-like algorithm. Some modifications:
 using blaze::DynamicMatrix;
 using blaze::StaticMatrix;
 
+inline double pow2C(double v) { return (v * v); }
+
 void allocateGlobals() {
   lmat = vector<vector<double>>(height, vector<double>(width));
   amat = vector<vector<double>>(height, vector<double>(width));
@@ -73,21 +75,21 @@ void selectInitialCenters() {
 double compute_distance(int cci, int ri, int ci) {
   const double centerRi = centers[cci][0];
   const double centerCi = centers[cci][1];
-  double ds = sqrt(pow(centerRi - ri, 2) + pow(centerCi - ci, 2));
-  double dc = sqrt(pow(centers[cci][2] - lmat[ri][ci], 2) +
-                   pow(centers[cci][3] - amat[ri][ci], 2) +
-                   pow(centers[cci][4] - bmat[ri][ci], 2));
-  return sqrt(pow(dc / weightFactor, 2) + pow(ds / step, 2));
+  double ds = sqrt(pow2C(centerRi - ri) + pow2C(centerCi - ci));
+  double dc = sqrt(pow2C(centers[cci][2] - lmat[ri][ci]) +
+                   pow2C(centers[cci][3] - amat[ri][ci]) +
+                   pow2C(centers[cci][4] - bmat[ri][ci]));
+  return sqrt(pow2C(dc / weightFactor) + pow2C(ds / step));
 }
 
 double compute_distance2(int cci, int ri, int ci) {
   const double centerRi = centers[cci][0];
   const double centerCi = centers[cci][1];
-  double ds2 = pow(centerRi - ri, 2) + pow(centerCi - ci, 2);
-  double dc2 = pow(centers[cci][2] - lmat[ri][ci], 2) +
-               pow(centers[cci][3] - amat[ri][ci], 2) +
-               pow(centers[cci][4] - bmat[ri][ci], 2);
-  return pow(dc2 / weightFactor2, 2) + pow(ds2 / step2, 2);
+  double ds2 = pow2C(centerRi - ri) + pow2C(centerCi - ci);
+  double dc2 = pow2C(centers[cci][2] - lmat[ri][ci]) +
+               pow2C(centers[cci][3] - amat[ri][ci]) +
+               pow2C(centers[cci][4] - bmat[ri][ci]);
+  return pow2C(dc2 / weightFactor2) + pow2C(ds2 / step2);
 }
 
 double cluster_color_similarity(int cci1, int cci2) {

test_polygon_fill.cpp

@@ -19,7 +19,7 @@ using namespace boost;
 // #define TEST_CLASSPOINTS 1
 
 int main() {
-  std::vector<BYTE> *imageFileData = readFile("assets/orange.bin");
+  std::vector<BYTE> *imageFileData = readFile("assets/orange-320x249.bin");
   width = 320;
   height = 249;
 
@@ -72,7 +72,7 @@ int main() {
 #endif
 
   std::ofstream fout;
-  fout.open("polygon_fill.bin", std::ios::binary | std::ios::out);
+  fout.open("polygon_fill-320x249.bin", std::ios::binary | std::ios::out);
   for (int i = 0; i < coloredMask.size(); i++) {
     fout.write((char *)&coloredMask[i], 4);
   }

tests/modulejs/basic.test.js

@@ -6,7 +6,9 @@ const range = require("lodash/range")
 
 const f = (p) => path.join(__dirname, p)
 
-const imData = Uint8Array.from(fs.readFileSync(f("../../assets/orange.bin")))
+const imData = Uint8Array.from(
+  fs.readFileSync(f("../../assets/orange-320x249.bin"))
+)
 
 async function setup() {
   while (!m.setImageSize) {
@@ -85,7 +87,7 @@ test("should be able to get a mask", async (t) => {
 
   t.assert(cppImDataUint8[0] === 255)
 
-  fs.writeFileSync(f("./mask.bin"), cppImDataUint8)
+  fs.writeFileSync(f("./mask-320x249.bin"), cppImDataUint8)
 })
 
 test("should be able to get a simple mode polygon mask", async (t) => {
@@ -98,7 +100,7 @@ test("should be able to get a simple mode polygon mask", async (t) => {
 
   m.clearClassElements()
   m.setClassColor(0, 0xff0000ff)
-  m.setClassColor(1, 0xffffffff)
+  m.setClassColor(1, 0xffff00ff)
 
   const pi1 = m.addPolygon(0)
   const pi2 = m.addPolygon(1)
@@ -132,5 +134,5 @@ test("should be able to get a simple mode polygon mask", async (t) => {
 
   t.pass("TODO for now manually confirm mask content in mask-polygon-only.bin!")
 
-  fs.writeFileSync(f("./mask-polygon-only.bin"), cppImDataUint8)
+  fs.writeFileSync(f("./mask-320x249-polygon-only.bin"), cppImDataUint8)
 })