[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[netCDF #XXW-396304]: Vectorization patch for NEC SX



> >
> > Have you tried the patch against the latest snapshot release to see if it 
> > still works, and is still necessary?
> 
> Yes and yes (for our NEC SX-9).
> 
> I tried the patch against netcdf-4.1-snapshot2009111214, and it still
> applies cleanly.  Please apply it, as it is safe for non-SX machines.
> 
> Harald
> 

Are we working from the same patch? It does not apply cleanly for me:

bash-3.2$ patch -p 0 < nec_sx_vector_ncx-361-patch 
patching file README-sx-ncx
patching file libsrc/ncx.m4
Hunk #5 succeeded at 1215 (offset 121 lines).
Hunk #7 succeeded at 1956 (offset 121 lines).
misordered hunks! output would be garbled
Hunk #9 FAILED at 2107.
Hunk #10 succeeded at 2190 (offset 23 lines).
misordered hunks! output would be garbled
Hunk #11 FAILED at 2256.
Hunk #12 succeeded at 2647 (offset 108 lines).
Hunk #13 succeeded at 2606 (offset 13 lines).
Hunk #14 succeeded at 2760 (offset 108 lines).
Hunk #15 succeeded at 2720 (offset 13 lines).
2 out of 15 hunks FAILED -- saving rejects to file libsrc/ncx.m4.rej

Yet the ncx.m4 file has not changed since March, 2008, so why would the patch 
work for you and not me?

Here's the contents of the rejects file:
***************
*** 2059,2064 ****
                                                                                
                                                
        *xpp = (const void *)xp;                                                
                                                
        return status;                                                          
                                                
  }                                                                             
                                                
  ')dnl                                                                         
                                                
  dnl dnl dnl                                                                   
                                                
--- 2107,2113 ----
                                                                                
                                                
        *xpp = (const void *)xp;                                                
                                                
        return status;                                                          
                                                
+ #  endif                                                                      
                                                
  }                                                                             
                                                
  ')dnl                                                                         
                                                
  dnl dnl dnl                                                                   
                                                
***************
*** 2143,2148 ****
                                                                                
                                                
        *xpp = (void *)xp;                                                      
                                                
        return status;                                                          
                                                
  }                                                                             
                                                
  ')dnl                                                                         
                                                
  dnl dnl dnl                                                                   
                                                
--- 2256,2262 ----
                                                                                
                                                
        *xpp = (void *)xp;                                                      
                                                
        return status;                                                          
                                                
+ #endif                                                   

Ticket Details
===================
Ticket ID: XXW-396304
Department: Support netCDF
Priority: High
Status: Open