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.

Sign up for GitHub

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

Issue 966 new scipy #1165

Merged
merged 3 commits into from
Mar 25, 2015
Merged

Issue 966 new scipy #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a61223
fix #966
doutriaux1 Mar 25, 2015
0ec5c04
updated the correct file with dependencies...
doutriaux1 Mar 25, 2015
bb5ab2c
I had the wrong deps file edited originally
doutriaux1 Mar 25, 2015
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
2 changes: 1 addition & 1 deletion CMake/cdat_modules/scipy_deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(SCIPY_deps ${numpy_pkg})
set(SCIPY_deps ${numpy_pkg} ${cython_pkg})
12 changes: 6 additions & 6 deletions CMake/cdat_modules/scipy_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
set(SCIPY_MAJOR 0)
set(SCIPY_MINOR 10)
set(SCIPY_PATCH 0)
set(SCIPY_MAJOR_SRC 0)
set(SCIPY_MINOR_SRC 15)
set(SCIPY_PATCH_SRC 1)
set(SCIPY_MAJOR_SRC dde07a64407ffaa9442b3d8298c6c26ff91fb384)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this SCIPY available on LLNL sever? what does this number represents?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a specific version is obtained from SciPy's Github, not just the master at the time of build. See scipy/scipy:dde07a6

set(SCIPY_MINOR_SRC)
set(SCIPY_PATCH_SRC)
set(SCIPY_URL ${LLNL_URL})
set(SCIPY_GZ scipy-${SCIPY_MAJOR_SRC}.${SCIPY_MINOR_SRC}.${SCIPY_PATCH_SRC}.tar.gz)
set(SCIPY_MD5 be56cd8e60591d6332aac792a5880110)
set(SCIPY_GZ scipy-dde07a64407ffaa9442b3d8298c6c26ff91fb384.zip)
set(SCIPY_MD5 03fed4942984c0220615fac2d8d675c7)
set(SCIPY_SOURCE ${SCIPY_URL}/${SCIPY_GZ})

set (nm SCIPY)
string(TOUPPER ${nm} uc_nm)
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC})

add_cdat_package_dependent(SCIPY "" "" OFF "CDAT_BUILD_LEAN" ON)