Skip to content

Commit 3bab96a

Browse files
author
abergeron
authored
Merge pull request #496 from slefrancois/win_git
Use conda git on windows and update install doc
2 parents d63c5ee + e1eb2c4 commit 3bab96a

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.jenkins_pr_win.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
REM Set path for cuda, conda python and cmake
2-
set PATH=%PATH%;C:\ProgramData\Miniconda2;C:\Program Files\CMake\bin;C:\lib\cuda\bin
2+
REM Set conda python, cudnn, cmake path
3+
set PATH=%PATH%;C:\ProgramData\Miniconda2;C:\ProgramData\Miniconda2\Library\usr\bin;C:\ProgramData\Miniconda2\Library\bin;C:\ProgramData\Miniconda2\Scripts
4+
set PATH=%PATH%;%CUDNNPATH%\bin;C:\Program Files\CMake\bin
35

46
REM Can also set to "Debug", "Release" to go faster
57
set GPUARRAY_CONFIG="Release"
@@ -24,7 +26,7 @@ cd ..
2426
set PATH=%PATH%;%WORKSPACE%\lib
2527

2628
REM Add conda gcc toolchain path
27-
set PATH=%PATH%;C:\ProgramData\Miniconda2\Library\mingw-w64\bin;C:\ProgramData\Miniconda2\Library\usr\bin;C:\ProgramData\Miniconda2\Library\bin;C:\ProgramData\Miniconda2\Scripts
29+
set PATH=%PATH%;C:\ProgramData\Miniconda2\Library\mingw-w64\bin
2830

2931
REM Build the pygpu modules
3032
python setup.py build_ext --inplace

doc/installation.rst

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,14 @@ If you prefer a command-line approach, cmake is available as a console
170170
program with the same options as the Unix variant. You can select the
171171
nmake builder by passing ``-G "NMake Makefiles"`` to cmake.
172172

173-
Since there is no standard install location on Windows, there is no
174-
install step. It is up to you to copy the headers and libraries to an
175-
appropriate place.
176-
177-
If you don't have Visual Studio installed, you can get the free
178-
Express version from `here <https://www.visualstudio.com/>`_ in the
179-
downloads section (select the "for windows" edition).
173+
There is no standard install location on Windows, but you can specify a custom
174+
location by passing ``-DCMAKE_INSTALL_PREFIX=%LIBDIR%`` to cmake. You can then
175+
install using ``cmake --build . --target install`` after ``nmake``.
176+
177+
If you don't have Visual Studio installed, you can get the free `Visual Studio
178+
Community edition <https://www.visualstudio.com/vs/community/>`_,
179+
which has compilation tools for python 3.5 and up. For python 2.7, install
180+
`Microsoft Visual C++ Compiler for Python 2.7 <https://www.microsoft.com/en-ca/download/details.aspx?id=44266>`_.
180181

181182
.. warning::
182183
While you may get the library to compile using cygwin, this is not

0 commit comments

Comments
 (0)