Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moose
Manage
Activity
Members
Labels
Plan
Issues
9
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sahil Moza
moose
Commits
42f15c95
Commit
42f15c95
authored
8 years ago
by
Dilawar Singh
Browse files
Options
Downloads
Patches
Plain Diff
Fixed, python2 incompatible print function use.
parent
67012a1c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!213
Update rmoogli.py
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+11
-7
11 additions, 7 deletions
CMakeLists.txt
moose-core/VERSION
+1
-1
1 addition, 1 deletion
moose-core/VERSION
moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py
+1
-2
1 addition, 2 deletions
moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py
with
13 additions
and
10 deletions
CMakeLists.txt
+
11
−
7
View file @
42f15c95
...
...
@@ -41,21 +41,22 @@ add_custom_command( OUTPUT ${OUTPUT_MOOSEBIN}
)
# Now build moose-gui and moose-examples.
# Make sure each script is compilable. Else report an error.
add_custom_target
(
gui ALL
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
MOOSE_GUI_DIR
}
${
MOOSE_GUI_INSTALL_DIR
}
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
MOOSE_GUI_DIR
}
${
MOOSE_GUI_INSTALL_DIR
}
COMMAND
${
PYTHON_EXECUTABLE
}
-m compileall -q
${
MOOSE_GUI_INSTALL_DIR
}
COMMENT
"Building moose-gui"
VERBATIM
)
# Now copy moose-examples.
add_custom_command
(
TARGET gui POST_BUILD
COMAMND
${
CMAKE_COMMAND
}
-E copy_directory
${
MOOSE_EXAMPLE_DIR
}
${
MOOSE_EXAMPLE_INSTALL_DIR
}
add_custom_target
(
examples ALL
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
MOOSE_EXAMPLE_DIR
}
${
MOOSE_EXAMPLE_INSTALL_DIR
}
COMMAND
${
PYTHON_EXECUTABLE
}
-m compileall -q
${
MOOSE_EXAMPLE_INSTALL_DIR
}
VERBATIM
)
add_dependencies
(
moose moose-core gui
)
add_dependencies
(
moose moose-core gui examples
)
add_dependencies
(
examples gui
)
## moose-gui
...
...
@@ -65,11 +66,13 @@ set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui)
install
(
DIRECTORY
${
PYMOOSE_INSTALL_DIR
}
/
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
PATTERN
".git"
EXCLUDE
PATTERN
"*.pyc"
EXCLUDE
)
install
(
DIRECTORY
${
MOOSE_GUI_INSTALL_DIR
}
/
DESTINATION lib/moose/gui
PATTERN
".git*"
EXCLUDE
PATTERN
"*.pyc"
EXCLUDE
)
install
(
DIRECTORY
${
MOOSE_EXAMPLE_DIR
}
/
...
...
@@ -77,6 +80,7 @@ install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/
PATTERN
".git*"
EXCLUDE
PATTERN
"_travis*"
EXCLUDE
PATTERN
".travis*"
EXCLUDE
PATTERN
"*.pyc"
EXCLUDE
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/moose.in
${
CMAKE_BINARY_DIR
}
/moose
)
...
...
This diff is collapsed.
Click to expand it.
moose-core/VERSION
+
1
−
1
View file @
42f15c95
3.1.1
\ No newline at end of file
3.1.1-71-g67012a1
\ No newline at end of file
This diff is collapsed.
Click to expand it.
moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py
+
1
−
2
View file @
42f15c95
from
__future__
import
print_function
#/**********************************************************************
#** This program is part of 'MOOSE', the
...
...
@@ -33,11 +34,9 @@ from PyQt4 import Qt, QtCore, QtGui
from
numpy
import
random
as
nprand
from
moose.neuroml.NeuroML
import
NeuroML
import
sys
sys
.
path
.
append
(
"
/home/bhalla/moose/trunk/Demos/util
"
)
import
rdesigneur
as
rd
import
moogli
cellname
=
"
./cells_channels/CA1_nochans.morph.xml
"
#cellname = "./ca1_minimal.p"
fname
=
"
fig6bcde
"
#############################################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment