mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-09 07:33:24 +00:00
Code Activity

try to update setup.py to libc naming

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-02-11 11:52:05 -08:00
parent b6294ab235
commit 98eae28fca
4 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/nightly.yaml
View file

@ -264,7 +264,7 @@ stages:
artifactName: 'Mac' artifactName: 'Mac'
targetPath: $(Agent.TempDirectory) targetPath: $(Agent.TempDirectory)
- script: cd $(Agent.TempDirectory); mkdir osx-bin; cd osx-bin; unzip ../*osx*.zip - script: cd $(Agent.TempDirectory); mkdir osx-bin; cd osx-bin; unzip ../*osx*.zip
- script: cd $(Agent.TempDirectory); mkdir linux-bin; cd linux-bin; unzip ../*glibc-2.9.zip - script: cd $(Agent.TempDirectory); mkdir linux-bin; cd linux-bin; unzip ../*glibc*.zip
- script: cd $(Agent.TempDirectory); mkdir win32-bin; cd win32-bin; unzip ../*x86-win*.zip - script: cd $(Agent.TempDirectory); mkdir win32-bin; cd win32-bin; unzip ../*x86-win*.zip
- script: cd $(Agent.TempDirectory); mkdir win64-bin; cd win64-bin; unzip ../*x64-win*.zip - script: cd $(Agent.TempDirectory); mkdir win64-bin; cd win64-bin; unzip ../*x64-win*.zip
- script: python3 -m pip install --user -U setuptools wheel - script: python3 -m pip install --user -U setuptools wheel

6
src/api/python/setup.py
View file

@ -234,7 +234,7 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv:
distos = RELEASE_METADATA[2] distos = RELEASE_METADATA[2]
if distos in ('debian', 'ubuntu') or 'linux' in distos: if distos in ('debian', 'ubuntu') or 'linux' in distos:
raise Exception("Linux binary distributions must be built on centos to conform to PEP 513") raise Exception("Linux binary distributions must be built on centos to conform to PEP 513")
elif distos == 'centos': elif distos == 'libc':
if arch == 'x64': if arch == 'x64':
plat_name = 'manylinux1_x86_64' plat_name = 'manylinux1_x86_64'
else: else:
@ -251,9 +251,9 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv:
if arch == 'x64': if arch == 'x64':
plat_name ='macosx_%s_x86_64' % osver.replace('.', '_') plat_name ='macosx_%s_x86_64' % osver.replace('.', '_')
else: else:
raise Exception('idk how os x works. what goes here?') raise Exception(f"idk how os {distos} {osvar} works. what goes here?")
else: else:
raise Exception("idk how to translate between this z3 release os and the python naming scheme") raise Exception(f"idk how to translate between this z3 release os {distos} and the python naming scheme")
idx = sys.argv.index('bdist_wheel') + 1 idx = sys.argv.index('bdist_wheel') + 1
sys.argv.insert(idx, '--plat-name') sys.argv.insert(idx, '--plat-name')

1
src/sat/sat_ddfw.cpp
View file

@ -224,7 +224,6 @@ namespace sat {
m_flat_use_list.append(ul); m_flat_use_list.append(ul);
} }
m_use_list_index.push_back(m_flat_use_list.size()); m_use_list_index.push_back(m_flat_use_list.size());
// m_use_list_index.push_back(m_flat_use_list.size());
} }

7
src/sat/sat_ddfw.h
View file

@ -107,12 +107,7 @@ namespace sat {
use_list(ddfw& p, literal lit): use_list(ddfw& p, literal lit):
p(p), i(lit.index()) {} p(p), i(lit.index()) {}
unsigned const* begin() { return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i]; } unsigned const* begin() { return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i]; }
unsigned const* end() { unsigned const* end() { return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i + 1]; }
if (p.m_use_list_index.size() <= i + 1) {
std::cout << "out of bounds\n";
}
VERIFY(p.m_use_list_index.size() > i + 1); return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i + 1];
}
}; };
void flatten_use_list(); void flatten_use_list();