fix windows?

bd7a732a · rusty1s · 05ffafbe · bd7a732a · bd7a732a
Commit bd7a732a authored Feb 23, 2020 by rusty1s
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

script/metis.sh script/metis.sh +6 -6

setup.py setup.py +2 -2

No files found.
--- a/script/metis.sh
+++ b/script/metis.sh
@@ -17,17 +17,17 @@ else

  cd build || exit

-  cmake .. -DSHARED=0
+  cmake ..
  cmake --build . --config "Release" --target ALL_BUILD
  # cp libmetis/Release/metis.lib ../..
  cp libmetis/Release/metis.lib /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/lib/x64

-  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
+  # 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
+  # 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

--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def get_extensions():
        extra_compile_args['nvcc'] = nvcc_flags

        if sys.platform == 'win32':
-            extra_link_args += ['cusparse.lib']
+            extra_link_args += ['cusparse.lib', 'metis.lib']
        else:
            extra_link_args += ['-lcusparse', '-l', 'cusparse']

@@ -59,7 +59,7 @@ def get_extensions():
            define_macros=define_macros,
            extra_compile_args=extra_compile_args,
            extra_link_args=extra_link_args,
-            libraries=['metis'],
+            # libraries=['metis'],
        )
        extensions += [extension]