Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nlopt] Enable UWP support #11398

Merged
merged 1 commit into from
May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 004f415c5d04dd1f616a953eb8ad078a20b72c58 Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Sat, 9 May 2020 13:56:40 -0400
Subject: [PATCH] suppress MS compiler complaint about negating unsigned
(closes #330)

---
src/util/sobolseq.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/util/sobolseq.c b/src/util/sobolseq.c
index 6626f51..848ff68 100644
--- a/src/util/sobolseq.c
+++ b/src/util/sobolseq.c
@@ -93,7 +93,12 @@ static unsigned rightzero32(uint32_t n)
const uint32_t a = 0x05f66a47; /* magic number, found by brute force */
static const unsigned decode[32] = { 0, 1, 2, 26, 23, 3, 15, 27, 24, 21, 19, 4, 12, 16, 28, 6, 31, 25, 22, 14, 20, 18, 11, 5, 30, 13, 17, 10, 29, 9, 8, 7 };
n = ~n; /* change to rightmost-one problem */
- n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */
+#ifdef _MSC_VER
+#pragma warning(suppress:4146)
+ n = a * (n & (-n)); /* same as below, but suppress spurious warning/error with MS compiler about negating unsigned int */
+#else
+ n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */
+#endif
return decode[n >> 27];
#endif
}
--
2.26.2.windows.1

3 changes: 1 addition & 2 deletions ports/nlopt/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Source: nlopt
Version: 2.6.2
Version: 2.6.2-1
Homepage: https://github.com/stevengj/nlopt
Description: a library for nonlinear local and global optimization, for functions with and without gradient information.
Supports: !uwp
4 changes: 2 additions & 2 deletions ports/nlopt/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
vcpkg_fail_port_install(ON_TARGET "UWP")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stevengj/nlopt
REF v2.6.2
SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
HEAD_REF master
PATCHES
0001-suppress-MS-compiler-complaint-about-negating-unsign.patch
)

vcpkg_configure_cmake(
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,6 @@ networkdirect-sdk:x64-linux=fail
networkdirect-sdk:x64-osx=fail
networkdirect-sdk:x64-uwp=fail
networkdirect-sdk:x86-windows=fail
nlopt:arm-uwp=fail
nlopt:x64-uwp=fail
nmslib:arm64-windows=fail
nmslib:arm-uwp=fail
nmslib:x64-uwp=fail
Expand Down