Skip to content

Commit 7cfffe4

Browse files
committed
Update for Mosek 11
1 parent df43957 commit 7cfffe4

File tree

3 files changed

+1563
-1180
lines changed

3 files changed

+1563
-1180
lines changed

src/pyoptinterface/_src/mosek.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,16 @@ def detected_libraries():
4040
}[platform.system()]
4141

4242
# Environment
43-
home = os.environ.get("MOSEK_10_2_BINDIR", None)
44-
if home is None:
45-
home = os.environ.get("MOSEK_10_1_BINDIR", None)
46-
if home and os.path.exists(home):
47-
dir = Path(home)
48-
for path in dir.glob(suffix_pattern):
49-
match = re.match(libname_pattern, path.name)
50-
if match:
51-
libs.append(str(path))
43+
possible_envs = ["MOSEK_11_0_BINDIR", "MOSEK_10_2_BINDIR", "MOSEK_10_1_BINDIR"]
44+
for env in possible_envs:
45+
home = os.environ.get(env, None)
46+
if home and os.path.exists(home):
47+
dir = Path(home)
48+
for path in dir.glob(suffix_pattern):
49+
match = re.match(libname_pattern, path.name)
50+
if match:
51+
libs.append(str(path))
52+
break
5253

5354
# mosekpy installation
5455
try:
@@ -78,7 +79,7 @@ def detected_libraries():
7879
default_libname = {
7980
"Linux": ["libmosek64.so"],
8081
"Darwin": ["libmosek64.dylib"],
81-
"Windows": ["mosek64_10_2.dll", "mosek64_10_1.dll"],
82+
"Windows": ["mosek64_11_0.dll", "mosek64_10_2.dll", "mosek64_10_1.dll"],
8283
}[platform.system()]
8384
libs.extend(default_libname)
8485

0 commit comments

Comments
 (0)