retry

1ad47fb2 · rusty1s · f67d0b91 · 1ad47fb2 · 1ad47fb2
Commit 1ad47fb2 authored Feb 23, 2020 by rusty1s
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

setup.py setup.py +3 -3

No files found.
--- a/script/metis.sh
+++ b/script/metis.sh
@@ -19,8 +19,13 @@ else

  cmake ..
  cmake --build . --config "Release" --target ALL_BUILD
+  cp libetmis/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.dll /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/x64

-  cp libmetis/Release/metis.lib /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/lib/x64
  cp ../include/metis.h /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/include

  cd ..

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

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

    extensions_dir = osp.join(osp.dirname(osp.abspath(__file__)), 'csrc')
    main_files = glob.glob(osp.join(extensions_dir, '*.cpp'))
@@ -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]