Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [OMPI svn-full] svn:open-mpi r29455 - in branches/v1.7: . ompi/mca/coll/fca
From: Ralph Castain (rhc_at_[hidden])
Date: 2013-10-21 15:44:18


The changeset itself was to fix two lines involving

item = (mca_coll_fca_c_cache_item_t *)...

I'm not sure why it marked all the rest of that code as having been "added" - it was already present when I looked at the code. I had to resolve a minor conflict, but that didn't significantly change the code content.

On Oct 21, 2013, at 12:32 PM, "Jeff Squyres (jsquyres)" <jsquyres_at_[hidden]> wrote:

> Mellanox --
>
> Can you clarify how this commit is "fix icc warning"? This seems much more like a feature addition...
>
>
> On Oct 21, 2013, at 3:24 PM, <svn-commit-mailer_at_[hidden]> wrote:
>
>> Author: rhc (Ralph Castain)
>> Date: 2013-10-21 15:24:35 EDT (Mon, 21 Oct 2013)
>> New Revision: 29455
>> URL: https://svn.open-mpi.org/trac/ompi/changeset/29455
>>
>> Log:
>> Fixes #3846: Move r29428 to v1.7 branch (fix icc warning)
>>
>> ---svn-pre-commit-ignore-below---
>>
>> r29428 [[BR]]
>> fix icc warning
>> fixed by Dinar, reviewed by miked
>> cmr=v1.7.4:reviewer=ompi-gk1.7
>>
>> Properties modified:
>> branches/v1.7/ (props changed)
>> Text files modified:
>> branches/v1.7/ompi/mca/coll/fca/coll_fca_component.c | 64 ++++++++++++++++++++++++++++++++++++---
>> 1 files changed, 59 insertions(+), 5 deletions(-)
>>
>> Modified: branches/v1.7/ompi/mca/coll/fca/coll_fca_component.c
>> ==============================================================================
>> --- branches/v1.7/ompi/mca/coll/fca/coll_fca_component.c Sat Oct 19 23:04:19 2013 (r29454)
>> +++ branches/v1.7/ompi/mca/coll/fca/coll_fca_component.c 2013-10-21 15:24:35 EDT (Mon, 21 Oct 2013) (r29455)
>> @@ -329,11 +329,65 @@
>>
>> static int fca_close(void)
>> {
>> - FCA_VERBOSE(2, "==>");
>> + if(mca_coll_fca_component.fca_enable_cache) {
>> +
>> + mca_coll_fca_c_cache_item_t *item;
>> + while(NULL != (item = (mca_coll_fca_c_cache_item_t *)opal_list_remove_first(&mca_coll_fca_component.c_cache))) {
>> + OBJ_RELEASE(item);
>> + }
>>
>> - if (!mca_coll_fca_component.fca_context)
>> - return OMPI_SUCCESS;
>> + if(mca_coll_fca_component.fca_enable_hash && mca_coll_fca_component.fca_enable_hash) {
>> + int i = 0;
>> + mca_coll_fca_c_cache_item_t *item;
>> + for(i = 0; i< mca_coll_fca_component.fca_hash_size; i++) {
>> +
>> + if(mca_coll_fca_component.fca_hash[i] != NULL) {
>> +
>> + while(NULL != (item = (mca_coll_fca_c_cache_item_t *)opal_list_remove_first(mca_coll_fca_component.fca_hash[i]))) {
>> + OBJ_RELEASE(item);
>> + }
>>
>> - mca_coll_fca_close_fca_lib();
>> - return OMPI_SUCCESS;
>> + OBJ_RELEASE(mca_coll_fca_component.fca_hash[i]);
>> +
>> + }
>> + }
>> + free(mca_coll_fca_component.fca_hash);
>> + }
>> +
>> + if(mca_coll_fca_component.fca_verbose == 10) {
>> + char file_name[30];
>> + sprintf(file_name, "rank_%d.txt", ORTE_PROC_MY_NAME->vpid);
>> + FILE *fileHandle;
>> + fileHandle = fopen(file_name,"w");
>> + fprintf(fileHandle, "%f\n", mca_coll_fca_component.fca_total_work_time);
>> + fprintf(fileHandle, "%d\n", mca_coll_fca_component.fca_cache_hit);
>> + fprintf(fileHandle, "%d\n", mca_coll_fca_component.fca_cache_miss);
>> + fprintf(fileHandle, "%d\n", mca_coll_fca_component.fca_hash_hit);
>> + fprintf(fileHandle, "%d\n", mca_coll_fca_component.fca_hash_miss);
>> + fprintf(fileHandle, "%d\n", mca_coll_fca_component.fca_max_deep_in_cache);
>> + fprintf(fileHandle, "%f\n", mca_coll_fca_component.fca_work_time_parallel);
>> + fprintf(fileHandle, "%f\n", mca_coll_fca_component.fca_work_time_sequency);
>> + fclose(fileHandle);
>> + }
>> +
>> +
>> + FCA_VERBOSE(10,"fca_total_work_time %f\n", mca_coll_fca_component.fca_total_work_time);
>> +
>> + FCA_VERBOSE(10,"fca_cache_hit %d\n", mca_coll_fca_component.fca_cache_hit);
>> +
>> + FCA_VERBOSE(10,"fca_cache_miss %d\n", mca_coll_fca_component.fca_cache_miss);
>> +
>> + FCA_VERBOSE(10,"fca_hash_hit %d\n", mca_coll_fca_component.fca_hash_hit);
>> +
>> + FCA_VERBOSE(10,"fca_hash_miss %d\n", mca_coll_fca_component.fca_hash_miss);
>> +
>> + FCA_VERBOSE(10,"fca_max_deep %d\n", mca_coll_fca_component.fca_max_deep_in_cache);
>> +
>> + FCA_VERBOSE(2, "==>");
>> +
>> + if (!mca_coll_fca_component.fca_context)
>> + return OMPI_SUCCESS;
>> +
>> + mca_coll_fca_close_fca_lib();
>> + return OMPI_SUCCESS;
>> }
>> _______________________________________________
>> svn-full mailing list
>> svn-full_at_[hidden]
>> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
>
>
> --
> Jeff Squyres
> jsquyres_at_[hidden]
> For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
>
> _______________________________________________
> devel mailing list
> devel_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/devel