Skip to content

Install mslice via conda #37897

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

Closed
wants to merge 2 commits into from
Closed

Install mslice via conda #37897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a959be9
Install mslice via conda
SilkeSchomann Aug 30, 2024
21cf4cd
Move mslice behind orsopy
SilkeSchomann Aug 30, 2024
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
1 change: 1 addition & 0 deletions conda/recipes/mantidworkbench/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ requirements:
{% if environ.get('INCLUDE_MANTIDDOCS', 'True') != 'False' %}
- mantiddocs {{ version }}
{% endif %}
- mslice

test:
imports:
Expand Down
2 changes: 2 additions & 0 deletions mantid-developer-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: mantid-developer

channels:
- conda-forge
- mantid

dependencies:
# Common packages
Expand Down Expand Up @@ -51,6 +52,7 @@ dependencies:
- versioningit>=2.1
- joblib
- orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
- mslice

# Not Windows, OpenGL implementation:
- mesa-libgl-devel-cos7-x86_64>=18.3.4
Expand Down
2 changes: 2 additions & 0 deletions mantid-developer-osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: mantid-developer

channels:
- conda-forge
- mantid

dependencies:
- ccache
Expand Down Expand Up @@ -49,6 +50,7 @@ dependencies:
- versioningit>=2.1
- joblib
- orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
- mslice

# Needed only for development
- black # may be out of sync with pre-commit
Expand Down
2 changes: 2 additions & 0 deletions mantid-developer-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: mantid-developer

channels:
- conda-forge
- mantid

dependencies:
- ccache
Expand Down Expand Up @@ -48,6 +49,7 @@ dependencies:
- versioningit>=2.1
- joblib
- orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
- mslice
# Needed only for development
- black # may be out of sync with pre-commit
- cppcheck==2.14.2
Expand Down
3 changes: 1 addition & 2 deletions scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ foreach(_dir ${_pth_dirs})
list(APPEND _pth_list_install "${_scripts_rel_path}/${_dir}")
endforeach()
list(APPEND _pth_list_dev ${CMAKE_CURRENT_BINARY_DIR})
list(APPEND _pth_list_dev ${MSLICE_DEV})
list(APPEND _pth_list_install "${_scripts_rel_path}/ExternalInterfaces")
# list(APPEND _pth_list_dev ${MSLICE_DEV}) list(APPEND _pth_list_install "${_scripts_rel_path}/ExternalInterfaces")

# development copy
set(_scripts_pth_src "${CMAKE_CURRENT_BINARY_DIR}/mantid-scripts.pth.src")
Expand Down
56 changes: 13 additions & 43 deletions scripts/ExternalInterfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,15 @@
# Fetch any externally-managed interfaces
include(ExternalProject)
# Fetch any externally-managed interfaces include(ExternalProject)

# mslice
set(_mslice_external_root ${CMAKE_CURRENT_BINARY_DIR}/src/mslice)
externalproject_add(
mslice
PREFIX ${_mslice_external_root}
UPDATE_DISCONNECTED "false"
GIT_REPOSITORY "https://github.com/mantidproject/mslice.git"
GIT_TAG cf985c648530d78d4d841896a6d2ead92a7a6b86
EXCLUDE_FROM_ALL 1
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
TEST_COMMAND ""
INSTALL_COMMAND ""
)
message(STATUS "Fetching/updating mslice")
execute_process(
COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitclone.cmake RESULT_VARIABLE _exit_code
)
if(_exit_code EQUAL 0)
execute_process(
COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitupdate.cmake RESULT_VARIABLE _exit_code
)
if(NOT _exit_code EQUAL 0)
message(FATAL_ERROR "Unable to update mslice.")
endif()
else()
message(FATAL_ERROR "Unable to clone mslice")
endif()
# Let the parent lists file know where dev copy of mslice is
set(MSLICE_DEV
${_mslice_external_root}/src/mslice/src
PARENT_SCOPE
)
# mslice set(_mslice_external_root ${CMAKE_CURRENT_BINARY_DIR}/src/mslice) externalproject_add( mslice PREFIX
# ${_mslice_external_root} UPDATE_DISCONNECTED "false" GIT_REPOSITORY "https://github.com/mantidproject/mslice.git"
# GIT_TAG cf985c648530d78d4d841896a6d2ead92a7a6b86 EXCLUDE_FROM_ALL 1 CONFIGURE_COMMAND "" BUILD_COMMAND "" TEST_COMMAND
# "" INSTALL_COMMAND "" ) message(STATUS "Fetching/updating mslice") execute_process( COMMAND ${CMAKE_COMMAND} ARGS -P
# ${_mslice_external_root}/tmp/mslice-gitclone.cmake RESULT_VARIABLE _exit_code ) if(_exit_code EQUAL 0)
# execute_process( COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitupdate.cmake RESULT_VARIABLE
# _exit_code ) if(NOT _exit_code EQUAL 0) message(FATAL_ERROR "Unable to update mslice.") endif() else()
# message(FATAL_ERROR "Unable to clone mslice") endif() Let the parent lists file know where dev copy of mslice is
# set(MSLICE_DEV ${_mslice_external_root}/src/mslice/src PARENT_SCOPE )

# Installation MSLICE_DEV is only set in PARENT_SCOPE! so don't use it here
foreach(_bundle ${BUNDLES})
install(
DIRECTORY ${_mslice_external_root}/src/mslice/src/mslice/
DESTINATION ${_bundle}scripts/ExternalInterfaces/mslice
COMPONENT Runtime
)
endforeach()
# Installation MSLICE_DEV is only set in PARENT_SCOPE! so don't use it here foreach(_bundle ${BUNDLES}) install(
# DIRECTORY ${_mslice_external_root}/src/mslice/src/mslice/ DESTINATION ${_bundle}scripts/ExternalInterfaces/mslice
# COMPONENT Runtime ) endforeach()
Loading