X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2Fclustering.R;h=4519f44bf36dade463302ac84011c3e004b2d54e;hb=4204e8774fdafe2db7ed44cd8cae018bc0c4e9d7;hp=0d37c243d4f76be57f157cb1ed5b59a0e4ef76b2;hpb=777c4b0274c059eeb5d4bd784ef773e819a7f7a2;p=epclust.git diff --git a/epclust/R/clustering.R b/epclust/R/clustering.R index 0d37c24..4519f44 100644 --- a/epclust/R/clustering.R +++ b/epclust/R/clustering.R @@ -121,26 +121,29 @@ computeSynchrones = function(medoids, getRefSeries, computeSynchronesChunk = function(indices) { + if (parll) + { + require("bigmemory", quietly=TRUE) + requireNamespace("synchronicity", quietly=TRUE) + require("epclust", quietly=TRUE) + synchrones <- bigmemory::attach.big.matrix(synchrones_desc) + counts <- bigmemory::attach.big.matrix(counts_desc) + medoids <- bigmemory::attach.big.matrix(medoids_desc) + m <- synchronicity::attach.mutex(m_desc) + } + ref_series = getRefSeries(indices) nb_series = nrow(ref_series) - #get medoids indices for this chunk of series - #TODO: debug this (address is OK but values are garbage: why?) -# mi = .Call("computeMedoidsIndices", medoids@address, ref_series, PACKAGE="epclust") - - #R-equivalent, requiring a matrix (thus potentially breaking "fit-in-memory" hope) - mat_meds = medoids[,] - mi = rep(NA,nb_series) - for (i in 1:nb_series) - mi[i] <- which.min( rowSums( sweep(mat_meds, 2, ref_series[i,], '-')^2 ) ) - rm(mat_meds); gc() + #get medoids indices for this chunk of series + mi = computeMedoidsIndices(medoids@address, ref_series) for (i in seq_len(nb_series)) { if (parll) synchronicity::lock(m) - synchrones[mi[i],] = synchrones[mi[i],] + ref_series[i,] - counts[mi[i],1] = counts[mi[i],1] + 1 + synchrones[ mi[i], ] = synchrones[ mi[i], ] + ref_series[i,] + counts[ mi[i] ] = counts[ mi[i] ] + 1 #TODO: remove counts? if (parll) synchronicity::unlock(m) } @@ -154,19 +157,19 @@ computeSynchrones = function(medoids, getRefSeries, # synchronicity is only for Linux & MacOS; on Windows: run sequentially parll = (requireNamespace("synchronicity",quietly=TRUE) && parll && Sys.info()['sysname'] != "Windows") - if (parll) - m <- synchronicity::boost.mutex() - if (parll) { + m <- synchronicity::boost.mutex() + m_desc <- synchronicity::describe(m) + synchrones_desc = bigmemory::describe(synchrones) + counts_desc = bigmemory::describe(counts) + medoids_desc = bigmemory::describe(medoids) cl = parallel::makeCluster(ncores_clust) - parallel::clusterExport(cl, - varlist=c("synchrones","counts","verbose","medoids","getRefSeries"), - envir=environment()) + parallel::clusterExport(cl, varlist=c("synchrones_desc","counts_desc","counts", + "verbose","m_desc","medoids_desc","getRefSeries"), envir=environment()) } indices_workers = .spreadIndices(seq_len(nb_ref_curves), nb_series_per_chunk) -#browser() ignored <- if (parll) parallel::parLapply(cl, indices_workers, computeSynchronesChunk) @@ -222,7 +225,9 @@ computeWerDists = function(synchrones, ncores_clust=1,verbose=FALSE,parll=TRUE) totnoct = noctave + as.integer(s0log/nvoice) + 1 Xwer_dist <- bigmemory::big.matrix(nrow=n, ncol=n, type="double") - fcoefs = rep(1/3, 3) #moving average on 3 values + + cwt_file = ".epclust_bin/cwt" + #TODO: args, nb_per_chunk, nbytes, endian # Generate n(n-1)/2 pairs for WER distances computations pairs = list() @@ -232,43 +237,68 @@ computeWerDists = function(synchrones, ncores_clust=1,verbose=FALSE,parll=TRUE) V = V[-1] pairs = c(pairs, lapply(V, function(v) c(i,v))) } - - computeCWT = function(i) + + computeSaveCWT = function(index) { - ts <- scale(ts(synchrones[i,]), center=TRUE, scale=scaled) + ts <- scale(ts(synchrones[index,]), center=TRUE, scale=scaled) totts.cwt = Rwave::cwt(ts, totnoct, nvoice, w0, plot=FALSE) ts.cwt = totts.cwt[,s0log:(s0log+noctave*nvoice)] #Normalization sqs <- sqrt(2^(0:(noctave*nvoice)/nvoice)*s0) sqres <- sweep(ts.cwt,2,sqs,'*') - sqres / max(Mod(sqres)) + res <- sqres / max(Mod(sqres)) + #TODO: serializer les CWT, les récupérer via getDataInFile ; + #--> OK, faut juste stocker comme séries simples de taille delta*ncol (53*17519) + binarize(res, cwt_file, 100, ",", nbytes, endian) + } + + if (parll) + { + cl = parallel::makeCluster(ncores_clust) + synchrones_desc <- bigmemory::describe(synchrones) + Xwer_dist_desc <- bigmemory::describe(Xwer_dist) + parallel::clusterExport(cl, varlist=c("synchrones_desc","Xwer_dist_desc","totnoct", + "nvoice","w0","s0log","noctave","s0","verbose","getCWT"), envir=environment()) + } + + #precompute and serialize all CWT + ignored <- + if (parll) + parallel::parLapply(cl, 1:n, computeSaveCWT) + else + lapply(1:n, computeSaveCWT) + + getCWT = function(index) + { + #from cwt_file ... } # Distance between rows i and j computeDistancesIJ = function(pair) { + if (parll) + { + require("bigmemory", quietly=TRUE) + require("epclust", quietly=TRUE) + synchrones <- bigmemory::attach.big.matrix(synchrones_desc) + Xwer_dist <- bigmemory::attach.big.matrix(Xwer_dist_desc) + } + i = pair[1] ; j = pair[2] if (verbose && j==i+1) cat(paste(" Distances (",i,",",j,"), (",i,",",j+1,") ...\n", sep="")) - cwt_i = computeCWT(i) - cwt_j = computeCWT(j) - num <- .Call("filter", Mod(cwt_i * Conj(cwt_j)), PACKAGE="epclust") - WX <- .Call("filter", Mod(cwt_i * Conj(cwt_i)), PACKAGE="epclust") - WY <- .Call("filter", Mod(cwt_j * Conj(cwt_j)), PACKAGE="epclust") + cwt_i <- getCWT(i) + cwt_j <- getCWT(j) + + num <- epclustFilter(Mod(cwt_i * Conj(cwt_j))) + WX <- epclustFilter(Mod(cwt_i * Conj(cwt_i))) + WY <- epclustFilter(Mod(cwt_j * Conj(cwt_j))) wer2 <- sum(colSums(num)^2) / sum(colSums(WX) * colSums(WY)) - Xwer_dist[i,j] <- sqrt(delta * ncol(cwt_i) * (1 - wer2)) + Xwer_dist[i,j] <- sqrt(delta * ncol(cwt_i) * max(1 - wer2, 0.)) #FIXME: wer2 should be < 1 Xwer_dist[j,i] <- Xwer_dist[i,j] Xwer_dist[i,i] = 0. } - if (parll) - { - cl = parallel::makeCluster(ncores_clust) - parallel::clusterExport(cl, - varlist=c("synchrones","totnoct","nvoice","w0","s0log","noctave","s0","verbose"), - envir=environment()) - } - ignored <- if (parll) parallel::parLapply(cl, pairs, computeDistancesIJ)