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.

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

Merge main into dev #226

Merged
merged 5 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# On Read the Docs, need to mock any python packages that would require c
from unittest.mock import MagicMock

MOCK_MODULES = ["mpi4py", "colorama"]
MOCK_MODULES = ["mpi4py", "colorama", "mpi4py.util.dtlib"]
sys.modules.update((mod_name, MagicMock()) for mod_name in MOCK_MODULES)


Expand Down
7 changes: 0 additions & 7 deletions mcdc/iqmc/iqmc_kernel.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Created on Mon Jun 10 21:52:17 2024

@author: sam pasmann
"""
from mpi4py import MPI

import mcdc.adapt as adapt
Expand Down
7 changes: 0 additions & 7 deletions mcdc/iqmc/iqmc_loop.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Created on Mon Jun 10 21:52:29 2024

@author: sam pasmann
"""
import mcdc.kernel as kernel
import mcdc.iqmc.iqmc_kernel as iqmc_kernel
import mcdc.adapt as adapt
Expand Down
Loading