diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 2211e32d2..4bf873e96 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -89,7 +89,8 @@ stages: - job: LinuxBuild variables: python: "/opt/python/cp37-cp37m/bin/python" - image: "quay.io/pypa/manylinux2010_x86_64:latest" + image: "quay.io/pypa/manylinux2010_x86_64:latest" + name: Linux displayName: "ManyLinux build" pool: vmImage: "Ubuntu-18.04" @@ -400,7 +401,7 @@ stages: # displayName: 'Download MuslLinux Build' # inputs: # artifact: 'MuslLinuxBuild' -# path: $(Agent.TempDirectory) +# path: $(Agent.TempDirectory) - task: DownloadPipelineArtifact@2 inputs: artifactName: 'Mac' @@ -412,14 +413,14 @@ stages: - script: cd $(Agent.TempDirectory); mkdir osx-x64-bin; cd osx-x64-bin; unzip ../*x64-osx*.zip - script: cd $(Agent.TempDirectory); mkdir osx-arm64-bin; cd osx-arm64-bin; unzip ../*arm64-osx*.zip - script: cd $(Agent.TempDirectory); mkdir libc-bin; cd libc-bin; unzip ../*glibc*.zip - - script: cd $(Agent.TempDirectory); mkdir musl-bin; cd musl-bin; unzip ../*-linux.zip +# - script: cd $(Agent.TempDirectory); mkdir musl-bin; cd musl-bin; unzip ../*-linux.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: python3 -m pip install --user -U setuptools wheel - script: cd src/api/python; python3 setup.py sdist # take a look at this PREMIUM HACK I came up with to get around the fact that the azure variable syntax overloads the bash syntax for subshells - script: cd src/api/python; echo $(Agent.TempDirectory)/libc-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel - - script: cd src/api/python; echo $(Agent.TempDirectory)/musl-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel +# - script: cd src/api/python; echo $(Agent.TempDirectory)/musl-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel - script: cd src/api/python; echo $(Agent.TempDirectory)/win32-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel - script: cd src/api/python; echo $(Agent.TempDirectory)/win64-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel - script: cd src/api/python; echo $(Agent.TempDirectory)/osx-x64-bin/* | xargs printf 'PACKAGE_FROM_RELEASE=%s\n' | xargs -I '{}' env '{}' python3 setup.py bdist_wheel diff --git a/src/math/simplex/sparse_matrix.h b/src/math/simplex/sparse_matrix.h index b51b57181..e26531c82 100644 --- a/src/math/simplex/sparse_matrix.h +++ b/src/math/simplex/sparse_matrix.h @@ -309,9 +309,9 @@ namespace simplex { all_rows get_rows() { return all_rows(*this); } numeral const& get_coeff(row r, unsigned v) { - for (auto & [coeff, u] : get_row(r)) - if (u == v) - return coeff; + for (auto & row : get_row(r)) + if (row.m_var == v) + return row.m_coeff; return m_zero; }