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

Jump to bottom

[WIP] Implement Matlab to Python Translator #17

Draft
wants to merge 65 commits into
base: 27-generate-unit-tests-for-cpdassignustar
Choose a base branch
from
Draft

[WIP] Implement Matlab to Python Translator #17

wants to merge 65 commits into from

Conversation

tztsai
Copy link

@tztsai tztsai commented Aug 8, 2024 •
edited
Loading

A translator from matlab code to python 2 code is implemented in the smop/ folder, adopted from the smop repository. A bash script m2py.sh is also added to automate the translation process and save the translated files in oneflux_steps/ustar_cp_py/. It will also run all the current pytest suit against the translated code.

To run the translation and testing, simply run bash m2py.sh.

@tztsai
Copy link
Author

tztsai commented Aug 8, 2024 •
edited
Loading

Further comment: an automatic workflow of translating matlab code to python might be useful if we want to work on the matlab code to add tests, etc. like in PR #15.

@tztsai tztsai self-assigned this Aug 22, 2024
@tztsai tztsai changed the base branch from main to 37-modularise-cpdBoostrap October 21, 2024 10:47
@tztsai tztsai changed the title [WIP] Use smop to Translate Matlab Code to Python 2 [WIP] Use smop to Translate Matlab Code to Python Oct 23, 2024
@tztsai tztsai changed the title [WIP] Use smop to Translate Matlab Code to Python [WIP] Implement Matlab to Python Translator Oct 23, 2024
@dorchard
Copy link
Member

This also updates from Python 2 to 3 using the 2to3 tool.

@tztsai tztsai changed the base branch from 37-modularise-cpdBoostrap to 27-generate-unit-tests-for-cpdassignustar October 28, 2024 19:19
tztsai added 21 commits October 28, 2024 19:20
@tztsai
use smop for auto translation from matlab to python
10925ba
@tztsai
use ruff to fix some issues
9c442eb
@tztsai
add matlab to python translator
caad22e
@tztsai
Fix cmd arguments and output paths of smop
9a862ca
@tztsai
add pre-commit config
326b4d4
@tztsai
Add smop TODO and fix some matlab code causing translation errors
dd4cf88
@tztsai
convert smop from py2 to py3
b713fc0
@tztsai
move libsmop into src/ and fix printing in comments
7343491
@tztsai
Fix single backslash string conversion
e80a27e
@tztsai
fix array indexing translation
01c59d8
@tztsai
add converted python files and ruff linting
444c70e
@tztsai
Update pre-commit hook
9b58584
@tztsai
reformat translated code
bcbff12
@tztsai
Fix all ruff linting errors
1f454bb
@tztsai
Fix varargin and implement missing matlab builtin funcs
e9eac7e
@tztsai
reformat
67dca87
@tztsai
treat the translated python module as another instance of pytest fixt…
e703a6e 
…ure `matlab_engine`
@tztsai
fix errors after running pytest on generated python files
c336e75
@tztsai
fix some errors and update TODO
00629a5
@tztsai
updates conftest
4f797bf
@tztsai
update matlab_engine fixture and TODO
fe317da
@tztsai tztsai mentioned this pull request Nov 14, 2024
Open
tztsai added 10 commits November 14, 2024 11:10
@tztsai
rename matlab_engine fixture to ustar_cp
94a690d
@tztsai
refactor setup_Stats and cpdEvaluateUStarTh4Season20100901 to use try…
9298f6c 
…-except for Stats initialization; update import statements in smop modules
@tztsai
Squashed commit of the following:
456eeda 
commit e94a521
Author: tztsai <[email protected]>
Date:   Thu Nov 14 13:45:28 2024 +0000

    Merge branch '27-generate-unit-tests-for-cpdassignustar' into test_and_refactor_cpdFmax2pCp3

commit 87e2526
Author: James Emberton <[email protected]>
Date:   Thu Nov 14 09:34:58 2024 +0000

    convert matlab to python

commit e72d639
Author: James Emberton <[email protected]>
Date:   Thu Nov 14 09:19:29 2024 +0000

    modified tests

commit 2cd15d3
Author: James Emberton <[email protected]>
Date:   Mon Nov 11 11:59:54 2024 +0000

    modularised function

commit 1e69989
Author: James Emberton <[email protected]>
Date:   Mon Nov 11 11:46:48 2024 +0000

    added initial tests

commit 44bfb80
Author: James Emberton <[email protected]>
Date:   Mon Oct 28 10:30:47 2024 +0000

    setup stats reset to original code logic

commit 69afcbb
Merge: 65aaafb 4d83e33
Author: Dominic Orchard <[email protected]>
Date:   Thu Oct 24 15:52:10 2024 +0100

    Merge pull request #41 from Cambridge-ICCS/change_ustar_cp_scope

    Change ustar_cp scope to 'session'

commit 4d83e33
Author: isaac <[email protected]>
Date:   Tue Oct 22 10:58:15 2024 +0100

    Change ustar_cp scope to 'session'
@tztsai
rename matlab_engine fixture to ustar_cp and update references in tests
98a0d58
@tztsai
Squashed commit of the following:
0d5ce35 
commit e94a521
Author: tztsai <[email protected]>
Date:   Thu Nov 14 13:45:28 2024 +0000

    Merge branch '27-generate-unit-tests-for-cpdassignustar' into test_and_refactor_cpdFmax2pCp3

commit 87e2526
Author: James Emberton <[email protected]>
Date:   Thu Nov 14 09:34:58 2024 +0000

    convert matlab to python

commit e72d639
Author: James Emberton <[email protected]>
Date:   Thu Nov 14 09:19:29 2024 +0000

    modified tests

commit 2cd15d3
Author: James Emberton <[email protected]>
Date:   Mon Nov 11 11:59:54 2024 +0000

    modularised function

commit 1e69989
Author: James Emberton <[email protected]>
Date:   Mon Nov 11 11:46:48 2024 +0000

    added initial tests

commit 44bfb80
Author: James Emberton <[email protected]>
Date:   Mon Oct 28 10:30:47 2024 +0000

    setup stats reset to original code logic

commit 69afcbb
Merge: 65aaafb 4d83e33
Author: Dominic Orchard <[email protected]>
Date:   Thu Oct 24 15:52:10 2024 +0100

    Merge pull request #41 from Cambridge-ICCS/change_matlab_engine_scope

    Change matlab_engine scope to 'session'

commit 4d83e33
Author: isaac <[email protected]>
Date:   Tue Oct 22 10:58:15 2024 +0100

    Change matlab_engine scope to 'session'
@tztsai
translate cpdFmax2Cp3
5fab6a9
@tztsai
refactor: integrate check_struct into various modules and update pyte…
d5a20c2 
…st command
@tztsai
fix interpolation function and integrate MATLAB type handling in the …
df3e88a 
…`function` decorator
@tztsai
fix: enhance interp1 function to handle NaN values and invalid inputs
4e91165
@tztsai
fix: replace concat with matlabarray and update matlabarray __new__ t…
59eed61 
…o handle concat
@tztsai tztsai closed this Nov 21, 2024
@tztsai tztsai deleted the m2py-auto branch November 21, 2024 15:52
@omarjamil omarjamil restored the m2py-auto branch November 21, 2024 16:53
@tztsai tztsai reopened this Dec 3, 2024
@dorchard
Copy link
Member

TODO: We will split off the generate Python into its own branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@tztsai tztsai

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tztsai @dorchard @j-emberton