Merge pull request #2 from faustomorales/fdm/fix-vector-order

Fix vector order

Author: faustomorales

.circleci/config.yml

@@ -1,4 +1,4 @@
 .venv
 ThreatExchange
-!ThreatExchange/hashing/pdq/cpp
+!ThreatExchange/pdq
 tests

.dockerignore

@@ -0,0 +1,34 @@
+name: pdqhash-python CI/CD
+
+on:
+  push:
+    branches: 
+      - '**'
+
+jobs:
+  test:
+    name: Test pdqhash-python
+    strategy:
+      matrix:
+        python-version: [3.6]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Get submodules
+        run: |
+          git submodule init
+          git submodule update --remote
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Pipenv
+        run: |
+          pip install pipenv
+      - name: Make Host Environment
+        run: |
+          make init
+      - name: Test Source
+        run: |
+          make test

.github/workflows/ci.yaml

@@ -1,3 +1,3 @@
 [submodule "ThreatExchange"]
 	path = ThreatExchange
-	url = git@github.com:facebook/ThreatExchange.git
+	url = https://github.com/facebook/ThreatExchange.git

.gitmodules

@@ -5,7 +5,7 @@ RUN pip install pipenv
 # Install project
 WORKDIR /usr/src
 COPY ./Pipfile* ./
-COPY ./ThreatExchange/hashing/pdq ./ThreatExchange/hashing/pdq
+COPY ./ThreatExchange/pdq ./ThreatExchange/pdq
 COPY ./setup* ./
 COPY ./pdqhash ./pdqhash
 COPY ./Makefile ./Makefile

Dockerfile

@@ -8,7 +8,7 @@ pylint = "==2.3.0"
 pytest = "*"
 yapf = "==0.25.0"
 numpy = "*"
-opencv-python = "*"
+opencv-python-headless = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6"

Pipfile

@@ -1 +1,5 @@
 from .bindings import compute, compute_dihedral, compute_float
+import warnings
+warnings.warn(
+    "Hash vector order changed between version 0.1.8 and 0.2.0. "
+    "See https://github.com/faustomorales/pdqhash-python/issues/1 for more details.")

ThreatExchange

@@ -3,12 +3,12 @@
 import numpy as np
 cimport numpy as np
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/common/pdqhashtypes.cpp" namespace "facebook::pdq::hashing":
+cdef extern from "pdq/cpp/common/pdqhashtypes.cpp" namespace "facebook::pdq::hashing":
     cdef struct Hash256:
         unsigned short w[16]
 
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
+cdef extern from "pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
     void pdqHash256FromFloatLuma(
         float* fullBuffer1,
         float* fullBuffer2,
@@ -21,7 +21,7 @@ cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" name
         int& quality
     )
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
+cdef extern from "pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
     void pdqFloat256FromFloatLuma(
         float* fullBuffer1,
         float* fullBuffer2,
@@ -33,7 +33,7 @@ cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" name
         int& quality
     )
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
+cdef extern from "pdq/cpp/hashing/pdqhashing.cpp" namespace "facebook::pdq::hashing":
     void pdqDihedralHash256esFromFloatLuma(
         float* fullBuffer1,
         float* fullBuffer2,
@@ -54,14 +54,14 @@ cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/pdqhashing.cpp" name
         int& quality
     )
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/downscaling/downscaling.cpp" namespace "facebook::pdq::downscaling":
+cdef extern from "pdq/cpp/downscaling/downscaling.cpp" namespace "facebook::pdq::downscaling":
     int computeJaroszFilterWindowSize(int oldDimension, int newDimension)
 
-cdef extern from "../ThreatExchange/hashing/pdq/cpp/hashing/torben.cpp" namespace "facebook::pdq::hashing":
+cdef extern from "pdq/cpp/hashing/torben.cpp" namespace "facebook::pdq::hashing":
     float torben(float m[], int n)
 
 def hash_to_vector(hash_value):
-    return np.array([(hash_value[(k & 255) >> 4] >> (k & 15)) & 1 for k in range(256)]).reshape(16, 16)[:, ::-1].flatten()
+    return np.array([(hash_value[(k & 255) >> 4] >> (k & 15)) & 1 for k in range(256)])[::-1]
 
 def compute(np.ndarray[char, ndim=3] image):
     cdef np.ndarray[float, ndim=2] gray = (image[:, :, 0]*0.299 + image[:, :, 1]*0.587 + image[:, :, 2] * 0.114).astype('float32')
@@ -109,7 +109,7 @@ def compute_float(np.ndarray[char, ndim=3] image):
         buffer16x64,
         buffer16x16,
         quality)    
-    return np.array(buffer16x16)[:, ::-1].flatten(), quality
+    return np.array(buffer16x16).flatten()[::-1], quality
 
 def compute_dihedral(np.ndarray[char, ndim=3] image):
     cdef np.ndarray[float, ndim=2] gray = (image[:, :, 0]*0.299 + image[:, :, 1]*0.587 + image[:, :, 2] * 0.114).astype('float32')

pdqhash/__init__.py

@@ -10,7 +10,7 @@ description = Python bindings for Facebook's PDQ hash
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/faustomorales/pdqhash-python
-version = 0.1.8
+version = 0.2.0
 license = MIT
 classifiers =
     Development Status :: 5 - Production/Stable