complete metis test

rusty1s · rusty1s · commit 0a659cdea20a · 2020-02-23T21:17:29.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,25 +2,25 @@ language: shell
 
 os:
   - linux
-  # - osx
+  - osx
   - windows
 
 env:
   global:
     - CUDA_HOME=/usr/local/cuda
   jobs:
     - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cpu
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu92
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu100
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu101
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cpu
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu92
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu100
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu101
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cpu
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu92
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu100
-    # - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu101
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu92
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu100
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.8 IDX=cu101
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cpu
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu92
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu100
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.7 IDX=cu101
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cpu
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu92
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu100
+    - TORCH_VERSION=1.4.0 PYTHON_VERSION=3.6 IDX=cu101
 
 jobs:
   exclude:  # Exclude *all* macOS CUDA jobs and Windows CUDA 9.2/10.0 jobs.
diff --git a/csrc/cpu/metis_cpu.cpp b/csrc/cpu/metis_cpu.cpp
@@ -1,4 +1,4 @@
-#include "metis_wrapper_cpu.h"
+#include "metis_cpu.h"
 
 #include <metis.h>
 
diff --git a/csrc/cpu/metis_cpu.h b/csrc/cpu/metis_cpu.h
diff --git a/csrc/metis.cpp b/csrc/metis.cpp
@@ -1,7 +1,7 @@
 #include <Python.h>
 #include <torch/script.h>
 
-#include "cpu/metis_wrapper_cpu.h"
+#include "cpu/metis_cpu.h"
 
 #include <metis.h>
 
diff --git a/script/metis.sh b/script/metis.sh
@@ -20,22 +20,6 @@ else
   cmake .. -A x64  # Ensure we are building with x64
   cmake --build . --config "Release" --target ALL_BUILD
   cp libmetis/Release/metis.lib /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/lib/x64
-
-  # ls /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64
-
-  # /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64/dumpbin.exe libmetis/Release/metis.lib
-
-  # cmake .. -DSHARED=1
-  # cmake --build . --config "Release" --target ALL_BUILD
-  # # cp libmetis/Release/metis.lib ../..
-  # cp libmetis/Release/metis.dll /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin
-
-  # ls /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin
-
-  # cmake .. -DSHARED=1
-  # cmake --build . --config "Release" --target ALL_BUILD
-  # cp libmetis/Release/metis.dll /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/x64
-
   cp ../include/metis.h /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/include
 
   cd ..
diff --git a/torch_sparse/__init__.py b/torch_sparse/__init__.py
@@ -8,8 +8,7 @@
 
 try:
     for library in [
-            '_version', '_convert', '_diag', '_spmm', '_spspmm',
-            '_metis_wrapper'
+            '_version', '_convert', '_diag', '_spmm', '_spspmm', '_metis'
     ]:
         torch.ops.load_library(importlib.machinery.PathFinder().find_spec(
             library, [osp.dirname(__file__)]).origin)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "metis_wrapper_cpu.h"`
	`1`	`+#include "metis_cpu.h"`
`2`	`2`
`3`	`3`	`#include <metis.h>`
`4`	`4`