Merge remote-tracking branch 'upstream/master'

Qiskit · Aug 24, 2020 · 0238d27 · 0238d27
2 parents f684b02 + c1ee3e2
commit 0238d27
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -181,6 +181,11 @@ else()
 	if(WIN32)
 		message(STATUS "Uncompressing OpenBLAS static library...")
 		execute_process(COMMAND ${CMAKE_COMMAND} -E tar "xvfj" "${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/openblas.7z" WORKING_DIRECTORY  "${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/")
+		set(OPENBLAS_DLLs
+			"${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/openblas.dll"
+			"${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/flang.dll"
+			"${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/flangrti.dll"
+			"${AER_SIMULATOR_CPP_SRC_DIR}/third-party/win64/lib/libomp.dll")
 	endif()
 	find_package(BLAS QUIET)
 	if(NOT BLAS_FOUND)
@@ -319,6 +324,13 @@ else() # Standalone build
 		PRIVATE ${AER_SIMULATOR_CPP_EXTERNAL_LIBS})
 	target_compile_definitions(qasm_simulator
 		PRIVATE ${AER_COMPILER_DEFINITIONS})
+	if(WIN32 AND NOT BLAS_LIB_PATH)
+		add_custom_command(TARGET qasm_simulator POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
+				${OPENBLAS_DLLs}
+				$<TARGET_FILE_DIR:qasm_simulator>)
+		install(FILES ${OPENBLAS_DLLs} DESTINATION bin)
+	endif()
+
 	install(TARGETS qasm_simulator DESTINATION bin)
 
 	# Linter

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -174,7 +174,7 @@ stages:
               set -x
               set -e
               source activate qiskit-aer
-              pip install -U pip setuptools virtualenv wheel
+              pip install -U setuptools virtualenv wheel
               pip install dist/*tar.gz
               pip install git+https://github.com/Qiskit/qiskit-terra
               python tools/verify_wheels.py

diff --git a/docs/conf.py b/docs/conf.py
@@ -46,7 +46,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.6.0'
+release = '0.7.0'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/qiskit/providers/aer/VERSION.txt b/qiskit/providers/aer/VERSION.txt
@@ -1 +1 @@
-0.6.0
+0.7.0
diff --git a/qiskit/providers/aer/backends/wrappers/CMakeLists.txt b/qiskit/providers/aer/backends/wrappers/CMakeLists.txt
@@ -35,4 +35,6 @@ install(TARGETS controller_wrappers LIBRARY DESTINATION qiskit/providers/aer/bac
 # Install redistributable dependencies
 if(APPLE)
     install(FILES "${CONAN_LIB_DIRS_LLVM-OPENMP}/libomp.dylib" DESTINATION qiskit/providers/aer/backends)
+elseif(WIN32 AND NOT BLAS_LIB_PATH)
+    install(FILES ${OPENBLAS_DLLs} DESTINATION qiskit/providers/aer/backends)
 endif()
diff --git a/releasenotes/notes/0.6/state-opset-150ac1fd8602406b.yaml b/releasenotes/notes/0.6/state-opset-150ac1fd8602406b.yaml
@@ -5,7 +5,7 @@ upgrade:
     validation of instructions, gates, and snapshots supported by simulators.
   - |
     Refactor OpSet class. Moved OpSet to separate header file and add
-    ``contains`` and ``diference`` methods based on ``std::set::contains``
+    ``contains`` and ``difference`` methods based on ``std::set::contains``
     and ``std::algorithm::set_difference``. These replace the removed invalid
     and validate instructions from OpSet, but with the order reversed. It
     returns a list of other ops not in current opset rather than opset

diff --git a/releasenotes/notes/0.6/upgrade-measure-sampling-b9bd728e7c90704e.yaml b/releasenotes/notes/0.6/upgrade-measure-sampling-b9bd728e7c90704e.yaml
@@ -4,4 +4,4 @@ upgrade:
     Improves how measurement sampling optimization is checked. The expensive
     part of this operation is now done once during circuit construction where
     rather than multiple times during simulation for when checking memory
-    requirements, simulation method, and final exection.
+    requirements, simulation method, and final execution.
diff --git a/src/third-party/win64/lib/openblas.7z b/src/third-party/win64/lib/openblas.7z