- Notifications
You must be signed in to change notification settings - Fork 536
Added compatibility for same time delta nodes #1477
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.
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
Conversation
BTW could you add a smoke test for draw_resource_bar()? Maybe by switching one of the workflows to using MultiProc https://github.com/nipy/nipype/blob/master/circle.yml#L67 and then generate a gantt plot for them (and preferably keep it in artefacts so we could eyeball it). |
Ok, I added what little I know about the smoke tests for the draw gantt chart functionality |
Awesome! This is exactly what we needed! |
Re-base with nipy master
… into resource_multiproc
@dclark87 - could you please merge with current master and push? |
Added some tolerance to the runtime profiler tests and re-based with nipy's master |
@dclark87 - we can't even look at the output log on circle because the workflow debug statements happen every couple of ms. can we reduce the debug statements?
|
Hey I made some fixes here to check for pandas (which is why the CI was failing) for the smoke tests. I also re-based with lastest nipy-master. Does this look all good to merge? |
circle.yml Outdated
timeout: 1600 | ||
- docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench test_spm Linear /root/examples/ workflow4d : | ||
timeout: 1600 | ||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this file contains git differences. should be resolved and re-committed
ah crap - will fix those, thanks |
@satra - this all g2g? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Please merge with upstream/master
- Shouldn't
nipype/interfaces/tests/test_runtime_profiler.py
go innipype/pipeline/plugins/tests/test_runtime_profiler.py
instead?
| ||
logger.debug('Free memory (GB): %d, Free processors: %d', | ||
free_memory_gb, free_processors) | ||
if len(jobids) > 0: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think @satra protected this trace printing with the runtime_profile
boolean as well.
if toappend: | ||
self.pending_tasks.extend(toappend) | ||
num_jobs = len(self.pending_tasks) | ||
logger.debug('Number of pending tasks: %d' % num_jobs) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This trace appeared too often, maybe it's ok to remove it. But I ask @satra first.
try: | ||
mem_mb = max(mem_mb, _get_ram_mb(pid, pyfunc=pyfunc)) | ||
num_threads = max(num_threads, _get_num_threads(psutil.Process(pid))) | ||
except psutil.AccessDenied as exc: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe disable the runtime_profile
here?
Hi @dclark87, can I ask the reason to close this PR? I think it is really valuable. |
Hey @oesteban - I closed the PR because I am no longer actively developing or pushing to the FCP-INDI/nipype repo - so I am not able to rebase and make those changes. The maintainers there can open the pull request back up, rebase and address your comments. |
Cool thanks! |
Minor fix to allow multiple nodes with the same timestamp (start or finish) to be plotted in the Gantt chart without raising an exception