Skip to content

Commit

Permalink
Update Windows build to VS2017
Browse files Browse the repository at this point in the history
  • Loading branch information
dean0x7d committed Jul 11, 2017
1 parent 9d511b6 commit 0f1e8e3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: '{build}'
os: Visual Studio 2015
os: Visual Studio 2017
platform:
- x86
- x64
Expand Down
4 changes: 2 additions & 2 deletions cppcore/include/kpm/calc_moments.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void basic(Collector& collect, Vector r0, Vector r1, Matrix const& h2,
auto const num_moments = collect.size();
assert(num_moments % 2 == 0);

constexpr auto zero = Collector::zero();
auto const zero = Collector::zero();
for (auto n = 2; n <= num_moments / 2; ++n) {
auto m2 = zero, m3 = zero;
auto const size = opt_size ? map.optimal_size(n, num_moments) : h2.rows();
Expand Down Expand Up @@ -66,7 +66,7 @@ void interleaved(Collector& collect, Vector r0, Vector r1, Matrix const& h2,

// Interleave moments `n` and `n + 1` for better data locality
// Diagonal + interleaved computes 4 moments per iteration
constexpr auto zero = Collector::zero();
auto const zero = Collector::zero();
for (auto n = idx_t{2}; n <= num_moments / 2; n += 2) {
auto m2 = zero, m3 = zero, m4 = zero, m5 = zero;
auto const max1 = opt_size ? map.index(n, num_moments) : map.last_index();
Expand Down
6 changes: 3 additions & 3 deletions docs/install/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ installing some dependencies.

.. rubric:: Windows

#. Install the `Visual C++ 2015 Runtime
<https://www.microsoft.com/en-us/download/details.aspx?id=53587>`_.
#. Install the `Visual C++ 2017 Runtime
<https://go.microsoft.com/fwlink/?LinkId=746572>`_.

#. Install numpy, scipy and matplotlib binaries from `Christoph Gohlke
<http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_.
Expand Down Expand Up @@ -63,7 +63,7 @@ Once you have everything, follow the steps below to compile and install pybindin

.. rubric:: Windows

#. Install `Visual Studio 2015 Community <https://www.visualstudio.com/products/visual-studio-community-vs>`_.
#. Install `Visual Studio 2017 Community <https://www.visualstudio.com/vs/community/>`_.
The Visual C++ compiler is required, so make sure to select it during the customization step
of the installation (C++ may not be installed by default).
#. Install `CMake`_.
Expand Down

0 comments on commit 0f1e8e3

Please sign in to comment.