Skip to content

Jenkins test + Python3 and 1D Profile Fixes#26

Merged
ASvyatkovskiy merged 56 commits into
masterfrom
jenkins_test
Jan 5, 2018
Merged

Jenkins test + Python3 and 1D Profile Fixes#26
ASvyatkovskiy merged 56 commits into
masterfrom
jenkins_test

Conversation

@ASvyatkovskiy
Copy link
Copy Markdown
Contributor

@ASvyatkovskiy ASvyatkovskiy commented Dec 25, 2017

This PR provides full build integration for Python 2.7 and Python 3.6 with Jenkins + additional classes for running Jenkins tests in parallel (for future use).

  1. Bug fixes for Python 3.6: tab-space inconsistencies, slicing errors due to float indexes.

  2. In addition, it changes hashing function from default python hash to stable hashlib's md5 for reproducibility between Python 2 and Python 3. No need to set PYTHONHASHSEED with hashlib.md5

  3. Fix interpolation error in edens_profile 1D profile signal (D3D, ZIPFIT01/PROFILES.EDENSFIT):

            if sig[i,order].shape[0] > 2:
                f = UnivariateSpline(mapping[i,order],sig[i,order],s=0,k=1,ext=0)
                sig_interp[i,:] = f(remapping)
            else:
                print('Signal {}, shot {} has not enough points for linear interpolation. dfitpack.error: (m>k) failed for hidden m: fpcurf0:m=1'.format(self.description,shot.number))

@ASvyatkovskiy ASvyatkovskiy changed the title Jenkins test + Fixes Jenkins test + Python3 Fixes Dec 27, 2017
@ASvyatkovskiy ASvyatkovskiy requested a review from jnkh December 27, 2017 14:04
@ASvyatkovskiy ASvyatkovskiy changed the title Jenkins test + Python3 Fixes Jenkins test + Python3 and 1D Profile Fixes Dec 27, 2017
@ASvyatkovskiy
Copy link
Copy Markdown
Contributor Author

Will merge for now, some D3D features might need to be reviewed in a separate pull request

@ASvyatkovskiy ASvyatkovskiy merged commit 4572ef2 into master Jan 5, 2018
@ASvyatkovskiy ASvyatkovskiy deleted the jenkins_test branch January 5, 2018 20:41
Copy link
Copy Markdown
Contributor

@jnkh jnkh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request looks good.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants