Skip to content

{math}[foss/2017b] HIPS v1.2b-rc5#5725

Merged
boegel merged 6 commits intoeasybuilders:developfrom
smoors:hips
Feb 25, 2018
Merged

{math}[foss/2017b] HIPS v1.2b-rc5#5725
boegel merged 6 commits intoeasybuilders:developfrom
smoors:hips

Conversation

@smoors
Copy link
Copy Markdown
Contributor

@smoors smoors commented Jan 25, 2018

No description provided.

@verdurin
Copy link
Copy Markdown
Member

@smoors please remove the SCOTCH easyconfig which has already been merged in #5735

@smoors
Copy link
Copy Markdown
Contributor Author

smoors commented Feb 22, 2018

@wpoely86 review?

@easybuilders easybuilders deleted a comment from boegelbot Feb 22, 2018
prebuildopts += 'echo "AR = ar" >>makefile.inc && '
prebuildopts += 'echo "ARFLAGS = -crs" >>makefile.inc && '
prebuildopts += 'echo "LN = ln" >>makefile.inc && '
prebuildopts += 'echo "CP = cp" >>makefile.inc && '
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hmm, isn't it easier to just copy makefile.inc.gnu to makefile.inc via prebuildopts, and then override values via buildopts like this:

buildopts = 'ISCOTCH="-I$EBROOTSCOTCH/include" LSCOTCH="-L$EBROOTSCOTCH/lib -lscotch -lscotcherr" '

Copy link
Copy Markdown
Contributor Author

@smoors smoors Feb 24, 2018

Choose a reason for hiding this comment

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

cool, I did not know you can do that

'PARTITIONER=-DSCOTCH_PART '
'ISCOTCH="-I$EBROOTSCOTCH/include" '
'LSCOTCH="-L$EBROOTSCOTCH/lib -lscotch -lscotcherr" '
'all '
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@smoors We usually format multi-line buildopts like this (keeping related options together, use double quotes for all values for consistency):

buildopts = 'all LBLAS="$LIBBLAS" COEFTYPE="-DTYPE_REAL" PARTITIONER="-DSCOTCH_PART" '
buildopts += 'ISCOTCH="-I$EBROOTSCOTCH/include" LSCOTCH="-L$EBROOTSCOTCH/lib -lscotch -lscotcherr"'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@smoors What about this?

'all '
)

files_to_copy = [(['LIB/*'], 'lib')]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I also see *.h files being copied into lib, shouldn't we copy those to include instead (and adjust sanity_check_paths accordingly)?

files_to_copy = [
    (['LIB/*.h', 'LIB/*.inc'], 'include'),
    (['LIB/*.a'], 'lib'),
]

sanity_check_paths = {
    'files': ['include/hips_fortran.h', 'include/hips.h', 'include/hips.inc', 'include/io.h', 'include/type.h',
              'lib/libhips.a', 'lib/libhipssequential.a', 'lib/libio.a', 'lib/libspkit.a'],
    'dirs': [],
}
         

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 24, 2018

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in this PR)
node2316.phanpy.os - Linux centos linux 7.4.1708, Intel(R) Xeon(R) CPU E5-2680 v3 @ 2.50GHz, Python 2.7.5
See https://gist.github.com/75d889b8650a8fcdb47caceb1ba848cd for a full test report.

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 24, 2018

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in this PR)
node2111.delcatty.os - Linux centos linux 7.4.1708, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/92964aa86032c61350a6a875388cc288 for a full test report.

@boegel boegel added this to the 3.5.2 milestone Feb 25, 2018
@boegel boegel added the new label Feb 25, 2018
@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 25, 2018

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in this PR)
gligar01.gligar.os - Linux centos linux 7.4.1708, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/4d535ad3efa3be932e714bb55b56fc6d for a full test report.

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 25, 2018

Going in, thanks @smoors!

@boegel boegel merged commit a34dbae into easybuilders:develop Feb 25, 2018
@smoors smoors deleted the hips branch January 27, 2020 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants